diff --git a/compiler/testData/codegen/boxInline/anonymousObjectOnCallSite/1.kt b/compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/anonymousObjectOnCallSite/1.kt
rename to compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt
diff --git a/compiler/testData/codegen/boxInline/anonymousObjectOnCallSite/2.kt b/compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/anonymousObjectOnCallSite/2.kt
rename to compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.2.kt
diff --git a/compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams/1.kt b/compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams/1.kt
rename to compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt
diff --git a/compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams/2.kt b/compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams/2.kt
rename to compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.2.kt
diff --git a/compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite/1.kt b/compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite/1.kt
rename to compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt
diff --git a/compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite/2.kt b/compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite/2.kt
rename to compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.2.kt
diff --git a/compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams/1.kt b/compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams/1.kt
rename to compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt
diff --git a/compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams/2.kt b/compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams/2.kt
rename to compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.2.kt
diff --git a/compiler/testData/codegen/boxInline/builders/1.kt b/compiler/testData/codegen/boxInline/builders/builders.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/builders/1.kt
rename to compiler/testData/codegen/boxInline/builders/builders.1.kt
diff --git a/compiler/testData/codegen/boxInline/builders/2.kt b/compiler/testData/codegen/boxInline/builders/builders.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/builders/2.kt
rename to compiler/testData/codegen/boxInline/builders/builders.2.kt
diff --git a/compiler/testData/codegen/boxInline/buildersAndLambdaCapturing/1.kt b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/buildersAndLambdaCapturing/1.kt
rename to compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt
diff --git a/compiler/testData/codegen/boxInline/buildersAndLambdaCapturing/2.kt b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/buildersAndLambdaCapturing/2.kt
rename to compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
diff --git a/compiler/testData/codegen/boxInline/captureInlinable/1.kt b/compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/captureInlinable/1.kt
rename to compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt
diff --git a/compiler/testData/codegen/boxInline/captureInlinable/2.kt b/compiler/testData/codegen/boxInline/capture/captureInlinable.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/captureInlinable/2.kt
rename to compiler/testData/codegen/boxInline/capture/captureInlinable.2.kt
diff --git a/compiler/testData/codegen/boxInline/captureInlinableAndOther/1.kt b/compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/captureInlinableAndOther/1.kt
rename to compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt
diff --git a/compiler/testData/codegen/boxInline/captureInlinableAndOther/2.kt b/compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/captureInlinableAndOther/2.kt
rename to compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.2.kt
diff --git a/compiler/testData/codegen/boxInline/captureThisAndReceiver/1.kt b/compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/captureThisAndReceiver/1.kt
rename to compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt
diff --git a/compiler/testData/codegen/boxInline/captureThisAndReceiver/2.kt b/compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/captureThisAndReceiver/2.kt
rename to compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.2.kt
diff --git a/compiler/testData/codegen/boxInline/generics/1.kt b/compiler/testData/codegen/boxInline/capture/generics.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/generics/1.kt
rename to compiler/testData/codegen/boxInline/capture/generics.1.kt
diff --git a/compiler/testData/codegen/boxInline/generics/2.kt b/compiler/testData/codegen/boxInline/capture/generics.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/generics/2.kt
rename to compiler/testData/codegen/boxInline/capture/generics.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleCapturingInClass/1.kt b/compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleCapturingInClass/1.kt
rename to compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleCapturingInClass/2.kt b/compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleCapturingInClass/2.kt
rename to compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleCapturingInPackage/1.kt b/compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleCapturingInPackage/1.kt
rename to compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleCapturingInPackage/2.kt b/compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleCapturingInPackage/2.kt
rename to compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.2.kt
diff --git a/compiler/testData/codegen/boxInline/closureChain/1.kt b/compiler/testData/codegen/boxInline/complex/closureChain.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/closureChain/1.kt
rename to compiler/testData/codegen/boxInline/complex/closureChain.1.kt
diff --git a/compiler/testData/codegen/boxInline/closureChain/2.kt b/compiler/testData/codegen/boxInline/complex/closureChain.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/closureChain/2.kt
rename to compiler/testData/codegen/boxInline/complex/closureChain.2.kt
diff --git a/compiler/testData/codegen/boxInline/forEachLine/1.kt b/compiler/testData/codegen/boxInline/complex/forEachLine.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/forEachLine/1.kt
rename to compiler/testData/codegen/boxInline/complex/forEachLine.1.kt
diff --git a/compiler/testData/codegen/boxInline/forEachLine/2.kt b/compiler/testData/codegen/boxInline/complex/forEachLine.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/forEachLine/2.kt
rename to compiler/testData/codegen/boxInline/complex/forEachLine.2.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaInLambda/1.kt b/compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaInLambda/1.kt
rename to compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaInLambda/2.kt b/compiler/testData/codegen/boxInline/complex/lambdaInLambda.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaInLambda/2.kt
rename to compiler/testData/codegen/boxInline/complex/lambdaInLambda.2.kt
diff --git a/compiler/testData/codegen/boxInline/use/1.kt b/compiler/testData/codegen/boxInline/complex/use.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/use/1.kt
rename to compiler/testData/codegen/boxInline/complex/use.1.kt
diff --git a/compiler/testData/codegen/boxInline/use/2.kt b/compiler/testData/codegen/boxInline/complex/use.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/use/2.kt
rename to compiler/testData/codegen/boxInline/complex/use.2.kt
diff --git a/compiler/testData/codegen/boxInline/with/1.kt b/compiler/testData/codegen/boxInline/complex/with.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/with/1.kt
rename to compiler/testData/codegen/boxInline/complex/with.1.kt
diff --git a/compiler/testData/codegen/boxInline/with/2.kt b/compiler/testData/codegen/boxInline/complex/with.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/with/2.kt
rename to compiler/testData/codegen/boxInline/complex/with.2.kt
diff --git a/compiler/testData/codegen/boxInline/defaultMethod/1.kt b/compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultMethod/1.kt
rename to compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt
diff --git a/compiler/testData/codegen/boxInline/defaultMethod/2.kt b/compiler/testData/codegen/boxInline/defaultValues/defaultMethod.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultMethod/2.kt
rename to compiler/testData/codegen/boxInline/defaultValues/defaultMethod.2.kt
diff --git a/compiler/testData/codegen/boxInline/inlineInDefaultParameter/1.kt b/compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/inlineInDefaultParameter/1.kt
rename to compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt
diff --git a/compiler/testData/codegen/boxInline/inlineInDefaultParameter/2.kt b/compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/inlineInDefaultParameter/2.kt
rename to compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleDefaultMethod/1.kt b/compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleDefaultMethod/1.kt
rename to compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleDefaultMethod/2.kt b/compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleDefaultMethod/2.kt
rename to compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.2.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaClassClash/1.kt b/compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaClassClash/1.kt
rename to compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaClassClash/2.kt b/compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaClassClash/2.kt
rename to compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.2.kt
diff --git a/compiler/testData/codegen/boxInline/noInlineLambdaX2/1.kt b/compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/noInlineLambdaX2/1.kt
rename to compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt
diff --git a/compiler/testData/codegen/boxInline/noInlineLambdaX2/2.kt b/compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/noInlineLambdaX2/2.kt
rename to compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.2.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaCloning/1.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaCloning/1.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaCloning/2.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaCloning/2.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.2.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaInLambda2/1.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaInLambda2/1.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaInLambda2/2.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaInLambda2/2.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.2.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaInLambdaNoInline/1.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaInLambdaNoInline/1.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt
diff --git a/compiler/testData/codegen/boxInline/lambdaInLambdaNoInline/2.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/lambdaInLambdaNoInline/2.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.2.kt
diff --git a/compiler/testData/codegen/boxInline/regeneratedLambdaName/1.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/regeneratedLambdaName/1.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt
diff --git a/compiler/testData/codegen/boxInline/regeneratedLambdaName/2.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/regeneratedLambdaName/2.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.2.kt
diff --git a/compiler/testData/codegen/boxInline/sameCaptured/1.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/sameCaptured/1.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt
diff --git a/compiler/testData/codegen/boxInline/sameCaptured/2.kt b/compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/sameCaptured/2.kt
rename to compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.2.kt
diff --git a/compiler/testData/codegen/boxInline/localFunInLambda/1.kt b/compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/localFunInLambda/1.kt
rename to compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt
diff --git a/compiler/testData/codegen/boxInline/localFunInLambda/2.kt b/compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/localFunInLambda/2.kt
rename to compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.2.kt
diff --git a/compiler/testData/codegen/boxInline/noInline/1.kt b/compiler/testData/codegen/boxInline/noInline/noInline.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/noInline/1.kt
rename to compiler/testData/codegen/boxInline/noInline/noInline.1.kt
diff --git a/compiler/testData/codegen/boxInline/noInline/2.kt b/compiler/testData/codegen/boxInline/noInline/noInline.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/noInline/2.kt
rename to compiler/testData/codegen/boxInline/noInline/noInline.2.kt
diff --git a/compiler/testData/codegen/boxInline/noInlineLambdaChain/1.kt b/compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/noInlineLambdaChain/1.kt
rename to compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt
diff --git a/compiler/testData/codegen/boxInline/noInlineLambdaChain/2.kt b/compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/noInlineLambdaChain/2.kt
rename to compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.2.kt
diff --git a/compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline/1.kt b/compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline/1.kt
rename to compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt
diff --git a/compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline/2.kt b/compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline/2.kt
rename to compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.2.kt
diff --git a/compiler/testData/codegen/boxInline/withoutInline/1.kt b/compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/withoutInline/1.kt
rename to compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt
diff --git a/compiler/testData/codegen/boxInline/withoutInline/2.kt b/compiler/testData/codegen/boxInline/noInline/withoutInline.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/withoutInline/2.kt
rename to compiler/testData/codegen/boxInline/noInline/withoutInline.2.kt
diff --git a/compiler/testData/codegen/boxInline/classObject/1.kt b/compiler/testData/codegen/boxInline/simple/classObject.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/classObject/1.kt
rename to compiler/testData/codegen/boxInline/simple/classObject.1.kt
diff --git a/compiler/testData/codegen/boxInline/classObject/2.kt b/compiler/testData/codegen/boxInline/simple/classObject.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/classObject/2.kt
rename to compiler/testData/codegen/boxInline/simple/classObject.2.kt
diff --git a/compiler/testData/codegen/boxInline/extension/1.kt b/compiler/testData/codegen/boxInline/simple/extension.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/extension/1.kt
rename to compiler/testData/codegen/boxInline/simple/extension.1.kt
diff --git a/compiler/testData/codegen/boxInline/extension/2.kt b/compiler/testData/codegen/boxInline/simple/extension.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/extension/2.kt
rename to compiler/testData/codegen/boxInline/simple/extension.2.kt
diff --git a/compiler/testData/codegen/boxInline/params/1.kt b/compiler/testData/codegen/boxInline/simple/params.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/params/1.kt
rename to compiler/testData/codegen/boxInline/simple/params.1.kt
diff --git a/compiler/testData/codegen/boxInline/params/2.kt b/compiler/testData/codegen/boxInline/simple/params.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/params/2.kt
rename to compiler/testData/codegen/boxInline/simple/params.2.kt
diff --git a/compiler/testData/codegen/boxInline/rootConstructor/1.kt b/compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/rootConstructor/1.kt
rename to compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt
diff --git a/compiler/testData/codegen/boxInline/rootConstructor/2.kt b/compiler/testData/codegen/boxInline/simple/rootConstructor.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/rootConstructor/2.kt
rename to compiler/testData/codegen/boxInline/simple/rootConstructor.2.kt
diff --git a/compiler/testData/codegen/boxInline/severalClosures/1.kt b/compiler/testData/codegen/boxInline/simple/severalClosures.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/severalClosures/1.kt
rename to compiler/testData/codegen/boxInline/simple/severalClosures.1.kt
diff --git a/compiler/testData/codegen/boxInline/severalClosures/2.kt b/compiler/testData/codegen/boxInline/simple/severalClosures.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/severalClosures/2.kt
rename to compiler/testData/codegen/boxInline/simple/severalClosures.2.kt
diff --git a/compiler/testData/codegen/boxInline/severalUsage/1.kt b/compiler/testData/codegen/boxInline/simple/severalUsage.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/severalUsage/1.kt
rename to compiler/testData/codegen/boxInline/simple/severalUsage.1.kt
diff --git a/compiler/testData/codegen/boxInline/severalUsage/2.kt b/compiler/testData/codegen/boxInline/simple/severalUsage.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/severalUsage/2.kt
rename to compiler/testData/codegen/boxInline/simple/severalUsage.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleDouble/1.kt b/compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleDouble/1.kt
rename to compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleDouble/2.kt b/compiler/testData/codegen/boxInline/simple/simpleDouble.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleDouble/2.kt
rename to compiler/testData/codegen/boxInline/simple/simpleDouble.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleEnum/1.kt b/compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleEnum/1.kt
rename to compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleEnum/2.kt b/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleEnum/2.kt
rename to compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleGenerics/1.kt b/compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleGenerics/1.kt
rename to compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleGenerics/2.kt b/compiler/testData/codegen/boxInline/simple/simpleGenerics.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleGenerics/2.kt
rename to compiler/testData/codegen/boxInline/simple/simpleGenerics.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleInt/1.kt b/compiler/testData/codegen/boxInline/simple/simpleInt.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleInt/1.kt
rename to compiler/testData/codegen/boxInline/simple/simpleInt.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleInt/2.kt b/compiler/testData/codegen/boxInline/simple/simpleInt.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleInt/2.kt
rename to compiler/testData/codegen/boxInline/simple/simpleInt.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleLambda/1.kt b/compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleLambda/1.kt
rename to compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleLambda/2.kt b/compiler/testData/codegen/boxInline/simple/simpleLambda.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleLambda/2.kt
rename to compiler/testData/codegen/boxInline/simple/simpleLambda.2.kt
diff --git a/compiler/testData/codegen/boxInline/simpleObject/1.kt b/compiler/testData/codegen/boxInline/simple/simpleObject.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleObject/1.kt
rename to compiler/testData/codegen/boxInline/simple/simpleObject.1.kt
diff --git a/compiler/testData/codegen/boxInline/simpleObject/2.kt b/compiler/testData/codegen/boxInline/simple/simpleObject.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/simpleObject/2.kt
rename to compiler/testData/codegen/boxInline/simple/simpleObject.2.kt
diff --git a/compiler/testData/codegen/boxInline/vararg/1.kt b/compiler/testData/codegen/boxInline/simple/vararg.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/vararg/1.kt
rename to compiler/testData/codegen/boxInline/simple/vararg.1.kt
diff --git a/compiler/testData/codegen/boxInline/vararg/2.kt b/compiler/testData/codegen/boxInline/simple/vararg.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/vararg/2.kt
rename to compiler/testData/codegen/boxInline/simple/vararg.2.kt
diff --git a/compiler/testData/codegen/boxInline/identityCheck/1.kt b/compiler/testData/codegen/boxInline/special/identityCheck.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/identityCheck/1.kt
rename to compiler/testData/codegen/boxInline/special/identityCheck.1.kt
diff --git a/compiler/testData/codegen/boxInline/identityCheck/2.kt b/compiler/testData/codegen/boxInline/special/identityCheck.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/identityCheck/2.kt
rename to compiler/testData/codegen/boxInline/special/identityCheck.2.kt
diff --git a/compiler/testData/codegen/boxInline/ifBranches/1.kt b/compiler/testData/codegen/boxInline/special/ifBranches.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/ifBranches/1.kt
rename to compiler/testData/codegen/boxInline/special/ifBranches.1.kt
diff --git a/compiler/testData/codegen/boxInline/ifBranches/2.kt b/compiler/testData/codegen/boxInline/special/ifBranches.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/ifBranches/2.kt
rename to compiler/testData/codegen/boxInline/special/ifBranches.2.kt
diff --git a/compiler/testData/codegen/boxInline/iinc/1.kt b/compiler/testData/codegen/boxInline/special/iinc.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/iinc/1.kt
rename to compiler/testData/codegen/boxInline/special/iinc.1.kt
diff --git a/compiler/testData/codegen/boxInline/iinc/2.kt b/compiler/testData/codegen/boxInline/special/iinc.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/iinc/2.kt
rename to compiler/testData/codegen/boxInline/special/iinc.2.kt
diff --git a/compiler/testData/codegen/boxInline/inlineChain/1.kt b/compiler/testData/codegen/boxInline/special/inlineChain.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/inlineChain/1.kt
rename to compiler/testData/codegen/boxInline/special/inlineChain.1.kt
diff --git a/compiler/testData/codegen/boxInline/inlineChain/2.kt b/compiler/testData/codegen/boxInline/special/inlineChain.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/inlineChain/2.kt
rename to compiler/testData/codegen/boxInline/special/inlineChain.2.kt
diff --git a/compiler/testData/codegen/boxInline/plusAssign/1.kt b/compiler/testData/codegen/boxInline/special/plusAssign.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/plusAssign/1.kt
rename to compiler/testData/codegen/boxInline/special/plusAssign.1.kt
diff --git a/compiler/testData/codegen/boxInline/plusAssign/2.kt b/compiler/testData/codegen/boxInline/special/plusAssign.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/plusAssign/2.kt
rename to compiler/testData/codegen/boxInline/special/plusAssign.2.kt
diff --git a/compiler/testData/codegen/boxInline/stackHeightBug/1.kt b/compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/stackHeightBug/1.kt
rename to compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt
diff --git a/compiler/testData/codegen/boxInline/stackHeightBug/2.kt b/compiler/testData/codegen/boxInline/special/stackHeightBug.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/stackHeightBug/2.kt
rename to compiler/testData/codegen/boxInline/special/stackHeightBug.2.kt
diff --git a/compiler/testData/codegen/boxInline/trait/1.kt b/compiler/testData/codegen/boxInline/trait/trait.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/trait/1.kt
rename to compiler/testData/codegen/boxInline/trait/trait.1.kt
diff --git a/compiler/testData/codegen/boxInline/trait/2.kt b/compiler/testData/codegen/boxInline/trait/trait.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/trait/2.kt
rename to compiler/testData/codegen/boxInline/trait/trait.2.kt
diff --git a/compiler/testData/codegen/boxInline/tryCatch/1.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/tryCatch/1.kt
rename to compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt
diff --git a/compiler/testData/codegen/boxInline/tryCatch/2.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/tryCatch/2.kt
rename to compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.2.kt
diff --git a/compiler/testData/codegen/boxInline/tryCatch2/1.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/tryCatch2/1.kt
rename to compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt
diff --git a/compiler/testData/codegen/boxInline/tryCatch2/2.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/tryCatch2/2.kt
rename to compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.2.kt
diff --git a/compiler/testData/codegen/boxInline/tryCatchFinally/1.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/tryCatchFinally/1.kt
rename to compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt
diff --git a/compiler/testData/codegen/boxInline/tryCatchFinally/2.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.2.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/tryCatchFinally/2.kt
rename to compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.2.kt
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java
index bc086effe2a..81ca6691ef7 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java
@@ -68,8 +68,6 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
     }
 
     public void doTestMultiFile(@NotNull String folderName) {
-        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL);
-
         final List<String> files = new ArrayList<String>(2);
         FileUtil.processFilesRecursively(new File(folderName), new Processor<File>() {
             @Override
@@ -81,14 +79,23 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
             }
         });
 
-        Collections.sort(files);
+        doTestMultiFile(files);
+    }
 
+    private void doTestMultiFile(@NotNull List<String> files) {
+        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL);
+        Collections.sort(files);
         loadFiles(ArrayUtil.toStringArray(files));
         blackBox();
     }
 
-    public void doTestMultiFileWithInlineCheck(@NotNull String folderName) {
-        doTestMultiFile(folderName);
+    public void doTestMultiFileWithInlineCheck(@NotNull String firstFileName) {
+        firstFileName = firstFileName.substring("compiler/testData/codegen/".length());
+        List<String> ifiles = new ArrayList<String>(2);
+        ifiles.add(firstFileName);
+        ifiles.add(firstFileName.substring(0, firstFileName.length() - "1.kt".length()) + "2.kt");
+
+        doTestMultiFile(ifiles);
         InlineTestUtil.checkNoCallsToInline(initializedClassLoader.getAllGeneratedFiles());
     }
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
index d5d93814696..bf33fe5331b 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
@@ -31,284 +31,407 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxInline")
+@InnerTestClasses({BlackBoxInlineCodegenTestGenerated.AnonymousObject.class, BlackBoxInlineCodegenTestGenerated.Builders.class, BlackBoxInlineCodegenTestGenerated.Capture.class, BlackBoxInlineCodegenTestGenerated.Complex.class, BlackBoxInlineCodegenTestGenerated.DefaultValues.class, BlackBoxInlineCodegenTestGenerated.LambdaClassClash.class, BlackBoxInlineCodegenTestGenerated.LambdaTransformation.class, BlackBoxInlineCodegenTestGenerated.LocalFunInLambda.class, BlackBoxInlineCodegenTestGenerated.NoInline.class, BlackBoxInlineCodegenTestGenerated.Simple.class, BlackBoxInlineCodegenTestGenerated.Special.class, BlackBoxInlineCodegenTestGenerated.Trait.class, BlackBoxInlineCodegenTestGenerated.TryCatchFinally.class})
 public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBoxInline() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline"), Pattern.compile("^([^\\.]+)$"), false);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.1.kt$"), true);
     }
     
-    @TestMetadata("anonymousObjectOnCallSite")
-    public void testAnonymousObjectOnCallSite() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSite/");
+    @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject")
+    public static class AnonymousObject extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInAnonymousObject() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("anonymousObjectOnCallSite.1.kt")
+        public void testAnonymousObjectOnCallSite() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+        }
+        
+        @TestMetadata("anonymousObjectOnCallSiteSuperParams.1.kt")
+        public void testAnonymousObjectOnCallSiteSuperParams() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+        }
+        
+        @TestMetadata("anonymousObjectOnDeclarationSite.1.kt")
+        public void testAnonymousObjectOnDeclarationSite() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+        }
+        
+        @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams.1.kt")
+        public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+        }
+        
     }
     
-    @TestMetadata("anonymousObjectOnCallSiteSuperParams")
-    public void testAnonymousObjectOnCallSiteSuperParams() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams/");
+    @TestMetadata("compiler/testData/codegen/boxInline/builders")
+    public static class Builders extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInBuilders() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("builders.1.kt")
+        public void testBuilders() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+        }
+        
+        @TestMetadata("buildersAndLambdaCapturing.1.kt")
+        public void testBuildersAndLambdaCapturing() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+        }
+        
     }
     
-    @TestMetadata("anonymousObjectOnDeclarationSite")
-    public void testAnonymousObjectOnDeclarationSite() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite/");
+    @TestMetadata("compiler/testData/codegen/boxInline/capture")
+    public static class Capture extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInCapture() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("captureInlinable.1.kt")
+        public void testCaptureInlinable() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+        }
+        
+        @TestMetadata("captureInlinableAndOther.1.kt")
+        public void testCaptureInlinableAndOther() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+        }
+        
+        @TestMetadata("captureThisAndReceiver.1.kt")
+        public void testCaptureThisAndReceiver() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+        }
+        
+        @TestMetadata("generics.1.kt")
+        public void testGenerics() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+        }
+        
+        @TestMetadata("simpleCapturingInClass.1.kt")
+        public void testSimpleCapturingInClass() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+        }
+        
+        @TestMetadata("simpleCapturingInPackage.1.kt")
+        public void testSimpleCapturingInPackage() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+        }
+        
     }
     
-    @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams")
-    public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams/");
+    @TestMetadata("compiler/testData/codegen/boxInline/complex")
+    public static class Complex extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInComplex() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("closureChain.1.kt")
+        public void testClosureChain() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+        }
+        
+        @TestMetadata("forEachLine.1.kt")
+        public void testForEachLine() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+        }
+        
+        @TestMetadata("lambdaInLambda.1.kt")
+        public void testLambdaInLambda() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+        }
+        
+        @TestMetadata("use.1.kt")
+        public void testUse() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/use.1.kt");
+        }
+        
+        @TestMetadata("with.1.kt")
+        public void testWith() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/with.1.kt");
+        }
+        
     }
     
-    @TestMetadata("builders")
-    public void testBuilders() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders/");
+    @TestMetadata("compiler/testData/codegen/boxInline/defaultValues")
+    public static class DefaultValues extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInDefaultValues() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("defaultMethod.1.kt")
+        public void testDefaultMethod() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+        }
+        
+        @TestMetadata("inlineInDefaultParameter.1.kt")
+        public void testInlineInDefaultParameter() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+        }
+        
+        @TestMetadata("simpleDefaultMethod.1.kt")
+        public void testSimpleDefaultMethod() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+        }
+        
     }
     
-    @TestMetadata("buildersAndLambdaCapturing")
-    public void testBuildersAndLambdaCapturing() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/buildersAndLambdaCapturing/");
+    @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash")
+    public static class LambdaClassClash extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInLambdaClassClash() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("lambdaClassClash.1.kt")
+        public void testLambdaClassClash() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+        }
+        
+        @TestMetadata("noInlineLambdaX2.1.kt")
+        public void testNoInlineLambdaX2() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+        }
+        
     }
     
-    @TestMetadata("captureInlinable")
-    public void testCaptureInlinable() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinable/");
+    @TestMetadata("compiler/testData/codegen/boxInline/lambdaTransformation")
+    public static class LambdaTransformation extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInLambdaTransformation() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("lambdaCloning.1.kt")
+        public void testLambdaCloning() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+        }
+        
+        @TestMetadata("lambdaInLambda2.1.kt")
+        public void testLambdaInLambda2() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+        }
+        
+        @TestMetadata("lambdaInLambdaNoInline.1.kt")
+        public void testLambdaInLambdaNoInline() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+        }
+        
+        @TestMetadata("regeneratedLambdaName.1.kt")
+        public void testRegeneratedLambdaName() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+        }
+        
+        @TestMetadata("sameCaptured.1.kt")
+        public void testSameCaptured() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+        }
+        
     }
     
-    @TestMetadata("captureInlinableAndOther")
-    public void testCaptureInlinableAndOther() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinableAndOther/");
+    @TestMetadata("compiler/testData/codegen/boxInline/localFunInLambda")
+    public static class LocalFunInLambda extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInLocalFunInLambda() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("localFunInLambda.1.kt")
+        public void testLocalFunInLambda() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+        }
+        
     }
     
-    @TestMetadata("captureThisAndReceiver")
-    public void testCaptureThisAndReceiver() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureThisAndReceiver/");
+    @TestMetadata("compiler/testData/codegen/boxInline/noInline")
+    public static class NoInline extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInNoInline() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("noInline.1.kt")
+        public void testNoInline() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+        }
+        
+        @TestMetadata("noInlineLambdaChain.1.kt")
+        public void testNoInlineLambdaChain() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+        }
+        
+        @TestMetadata("noInlineLambdaChainWithCapturedInline.1.kt")
+        public void testNoInlineLambdaChainWithCapturedInline() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+        }
+        
+        @TestMetadata("withoutInline.1.kt")
+        public void testWithoutInline() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+        }
+        
     }
     
-    @TestMetadata("classObject")
-    public void testClassObject() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/classObject/");
+    @TestMetadata("compiler/testData/codegen/boxInline/simple")
+    public static class Simple extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInSimple() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("classObject.1.kt")
+        public void testClassObject() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+        }
+        
+        @TestMetadata("extension.1.kt")
+        public void testExtension() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+        }
+        
+        @TestMetadata("params.1.kt")
+        public void testParams() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/params.1.kt");
+        }
+        
+        @TestMetadata("rootConstructor.1.kt")
+        public void testRootConstructor() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+        }
+        
+        @TestMetadata("severalClosures.1.kt")
+        public void testSeveralClosures() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+        }
+        
+        @TestMetadata("severalUsage.1.kt")
+        public void testSeveralUsage() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+        }
+        
+        @TestMetadata("simpleDouble.1.kt")
+        public void testSimpleDouble() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+        }
+        
+        @TestMetadata("simpleEnum.1.kt")
+        public void testSimpleEnum() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+        }
+        
+        @TestMetadata("simpleGenerics.1.kt")
+        public void testSimpleGenerics() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+        }
+        
+        @TestMetadata("simpleInt.1.kt")
+        public void testSimpleInt() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+        }
+        
+        @TestMetadata("simpleLambda.1.kt")
+        public void testSimpleLambda() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+        }
+        
+        @TestMetadata("simpleObject.1.kt")
+        public void testSimpleObject() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+        }
+        
+        @TestMetadata("vararg.1.kt")
+        public void testVararg() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+        }
+        
     }
     
-    @TestMetadata("closureChain")
-    public void testClosureChain() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/closureChain/");
+    @TestMetadata("compiler/testData/codegen/boxInline/special")
+    public static class Special extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInSpecial() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("identityCheck.1.kt")
+        public void testIdentityCheck() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+        }
+        
+        @TestMetadata("ifBranches.1.kt")
+        public void testIfBranches() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+        }
+        
+        @TestMetadata("iinc.1.kt")
+        public void testIinc() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+        }
+        
+        @TestMetadata("inlineChain.1.kt")
+        public void testInlineChain() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+        }
+        
+        @TestMetadata("plusAssign.1.kt")
+        public void testPlusAssign() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+        }
+        
+        @TestMetadata("stackHeightBug.1.kt")
+        public void testStackHeightBug() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+        }
+        
     }
     
-    @TestMetadata("defaultMethod")
-    public void testDefaultMethod() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultMethod/");
+    @TestMetadata("compiler/testData/codegen/boxInline/trait")
+    public static class Trait extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInTrait() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("trait.1.kt")
+        public void testTrait() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+        }
+        
     }
     
-    @TestMetadata("extension")
-    public void testExtension() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/extension/");
+    @TestMetadata("compiler/testData/codegen/boxInline/tryCatchFinally")
+    public static class TryCatchFinally extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInTryCatchFinally() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("tryCatch.1.kt")
+        public void testTryCatch() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+        }
+        
+        @TestMetadata("tryCatch2.1.kt")
+        public void testTryCatch2() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+        }
+        
+        @TestMetadata("tryCatchFinally.1.kt")
+        public void testTryCatchFinally() throws Exception {
+            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+        }
+        
     }
     
-    @TestMetadata("forEachLine")
-    public void testForEachLine() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/forEachLine/");
+    public static Test suite() {
+        TestSuite suite = new TestSuite("BlackBoxInlineCodegenTestGenerated");
+        suite.addTestSuite(BlackBoxInlineCodegenTestGenerated.class);
+        suite.addTestSuite(AnonymousObject.class);
+        suite.addTestSuite(Builders.class);
+        suite.addTestSuite(Capture.class);
+        suite.addTestSuite(Complex.class);
+        suite.addTestSuite(DefaultValues.class);
+        suite.addTestSuite(LambdaClassClash.class);
+        suite.addTestSuite(LambdaTransformation.class);
+        suite.addTestSuite(LocalFunInLambda.class);
+        suite.addTestSuite(NoInline.class);
+        suite.addTestSuite(Simple.class);
+        suite.addTestSuite(Special.class);
+        suite.addTestSuite(Trait.class);
+        suite.addTestSuite(TryCatchFinally.class);
+        return suite;
     }
-    
-    @TestMetadata("generics")
-    public void testGenerics() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/generics/");
-    }
-    
-    @TestMetadata("identityCheck")
-    public void testIdentityCheck() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/identityCheck/");
-    }
-    
-    @TestMetadata("ifBranches")
-    public void testIfBranches() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/ifBranches/");
-    }
-    
-    @TestMetadata("iinc")
-    public void testIinc() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/iinc/");
-    }
-    
-    @TestMetadata("inlineChain")
-    public void testInlineChain() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/inlineChain/");
-    }
-    
-    @TestMetadata("inlineInDefaultParameter")
-    public void testInlineInDefaultParameter() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/inlineInDefaultParameter/");
-    }
-    
-    @TestMetadata("lambdaClassClash")
-    public void testLambdaClassClash() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/");
-    }
-    
-    @TestMetadata("lambdaCloning")
-    public void testLambdaCloning() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaCloning/");
-    }
-    
-    @TestMetadata("lambdaInLambda")
-    public void testLambdaInLambda() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda/");
-    }
-    
-    @TestMetadata("lambdaInLambda2")
-    public void testLambdaInLambda2() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda2/");
-    }
-    
-    @TestMetadata("lambdaInLambdaNoInline")
-    public void testLambdaInLambdaNoInline() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambdaNoInline/");
-    }
-    
-    @TestMetadata("localFunInLambda")
-    public void testLocalFunInLambda() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/");
-    }
-    
-    @TestMetadata("noInline")
-    public void testNoInline() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/");
-    }
-    
-    @TestMetadata("noInlineLambdaChain")
-    public void testNoInlineLambdaChain() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChain/");
-    }
-    
-    @TestMetadata("noInlineLambdaChainWithCapturedInline")
-    public void testNoInlineLambdaChainWithCapturedInline() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline/");
-    }
-    
-    @TestMetadata("noInlineLambdaX2")
-    public void testNoInlineLambdaX2() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaX2/");
-    }
-    
-    @TestMetadata("params")
-    public void testParams() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/params/");
-    }
-    
-    @TestMetadata("plusAssign")
-    public void testPlusAssign() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/plusAssign/");
-    }
-    
-    @TestMetadata("regeneratedLambdaName")
-    public void testRegeneratedLambdaName() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/regeneratedLambdaName/");
-    }
-    
-    @TestMetadata("rootConstructor")
-    public void testRootConstructor() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/rootConstructor/");
-    }
-    
-    @TestMetadata("sameCaptured")
-    public void testSameCaptured() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/sameCaptured/");
-    }
-    
-    @TestMetadata("severalClosures")
-    public void testSeveralClosures() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/severalClosures/");
-    }
-    
-    @TestMetadata("severalUsage")
-    public void testSeveralUsage() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/severalUsage/");
-    }
-    
-    @TestMetadata("simpleCapturingInClass")
-    public void testSimpleCapturingInClass() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInClass/");
-    }
-    
-    @TestMetadata("simpleCapturingInPackage")
-    public void testSimpleCapturingInPackage() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInPackage/");
-    }
-    
-    @TestMetadata("simpleDefaultMethod")
-    public void testSimpleDefaultMethod() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleDefaultMethod/");
-    }
-    
-    @TestMetadata("simpleDouble")
-    public void testSimpleDouble() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleDouble/");
-    }
-    
-    @TestMetadata("simpleEnum")
-    public void testSimpleEnum() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleEnum/");
-    }
-    
-    @TestMetadata("simpleGenerics")
-    public void testSimpleGenerics() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleGenerics/");
-    }
-    
-    @TestMetadata("simpleInt")
-    public void testSimpleInt() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleInt/");
-    }
-    
-    @TestMetadata("simpleLambda")
-    public void testSimpleLambda() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleLambda/");
-    }
-    
-    @TestMetadata("simpleObject")
-    public void testSimpleObject() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleObject/");
-    }
-    
-    @TestMetadata("stackHeightBug")
-    public void testStackHeightBug() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/stackHeightBug/");
-    }
-    
-    @TestMetadata("trait")
-    public void testTrait() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/trait/");
-    }
-    
-    @TestMetadata("tryCatch")
-    public void testTryCatch() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch/");
-    }
-    
-    @TestMetadata("tryCatch2")
-    public void testTryCatch2() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch2/");
-    }
-    
-    @TestMetadata("tryCatchFinally")
-    public void testTryCatchFinally() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/");
-    }
-    
-    @TestMetadata("use")
-    public void testUse() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/use/");
-    }
-    
-    @TestMetadata("vararg")
-    public void testVararg() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/vararg/");
-    }
-    
-    @TestMetadata("with")
-    public void testWith() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/with/");
-    }
-    
-    @TestMetadata("withoutInline")
-    public void testWithoutInline() throws Exception {
-        doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/withoutInline/");
-    }
-    
 }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
index e5b95bc318d..0ef2e13b7f2 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
@@ -64,24 +64,17 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit
         invokeMain();
     }
 
-    public void doBoxTestWithInlineCheck(@NotNull String folderName) throws Exception {
-        ArrayList<OutputFile> files = doBoxTest(folderName);
+    public void doBoxTestWithInlineCheck(@NotNull String firstFileName) throws Exception {
+        List<String> ifiles = new ArrayList<String>(2);
+        ifiles.add(firstFileName);
+        ifiles.add(firstFileName.substring(0, firstFileName.length() - "1.kt".length()) + "2.kt");
+
+        ArrayList<OutputFile> files = doBoxTest(ifiles);
         InlineTestUtil.checkNoCallsToInline(files);
     }
 
     @NotNull
-    private ArrayList<OutputFile> doBoxTest(@NotNull String folderName) throws Exception {
-        final List<String> files = new ArrayList<String>(2);
-        FileUtil.processFilesRecursively(new File(folderName), new Processor<File>() {
-            @Override
-            public boolean process(File file) {
-                if (file.getName().endsWith(".kt")) {
-                    files.add(file.getPath());
-                }
-                return true;
-            }
-        });
-
+    private ArrayList<OutputFile> doBoxTest(@NotNull List<String> files) throws Exception {
         Collections.sort(files);
 
         ClassFileFactory factory1 = null;
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
index 42804fa6125..26959cb903e 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
@@ -31,284 +31,407 @@ import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxInline")
+@InnerTestClasses({CompileKotlinAgainstInlineKotlinTestGenerated.AnonymousObject.class, CompileKotlinAgainstInlineKotlinTestGenerated.Builders.class, CompileKotlinAgainstInlineKotlinTestGenerated.Capture.class, CompileKotlinAgainstInlineKotlinTestGenerated.Complex.class, CompileKotlinAgainstInlineKotlinTestGenerated.DefaultValues.class, CompileKotlinAgainstInlineKotlinTestGenerated.LambdaClassClash.class, CompileKotlinAgainstInlineKotlinTestGenerated.LambdaTransformation.class, CompileKotlinAgainstInlineKotlinTestGenerated.LocalFunInLambda.class, CompileKotlinAgainstInlineKotlinTestGenerated.NoInline.class, CompileKotlinAgainstInlineKotlinTestGenerated.Simple.class, CompileKotlinAgainstInlineKotlinTestGenerated.Special.class, CompileKotlinAgainstInlineKotlinTestGenerated.Trait.class, CompileKotlinAgainstInlineKotlinTestGenerated.TryCatchFinally.class})
 public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest {
     public void testAllFilesPresentInBoxInline() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline"), Pattern.compile("^([^\\.]+)$"), false);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.1.kt$"), true);
     }
     
-    @TestMetadata("anonymousObjectOnCallSite")
-    public void testAnonymousObjectOnCallSite() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSite/");
+    @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject")
+    public static class AnonymousObject extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInAnonymousObject() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("anonymousObjectOnCallSite.1.kt")
+        public void testAnonymousObjectOnCallSite() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+        }
+        
+        @TestMetadata("anonymousObjectOnCallSiteSuperParams.1.kt")
+        public void testAnonymousObjectOnCallSiteSuperParams() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+        }
+        
+        @TestMetadata("anonymousObjectOnDeclarationSite.1.kt")
+        public void testAnonymousObjectOnDeclarationSite() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+        }
+        
+        @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams.1.kt")
+        public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+        }
+        
     }
     
-    @TestMetadata("anonymousObjectOnCallSiteSuperParams")
-    public void testAnonymousObjectOnCallSiteSuperParams() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams/");
+    @TestMetadata("compiler/testData/codegen/boxInline/builders")
+    public static class Builders extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInBuilders() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("builders.1.kt")
+        public void testBuilders() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+        }
+        
+        @TestMetadata("buildersAndLambdaCapturing.1.kt")
+        public void testBuildersAndLambdaCapturing() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+        }
+        
     }
     
-    @TestMetadata("anonymousObjectOnDeclarationSite")
-    public void testAnonymousObjectOnDeclarationSite() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite/");
+    @TestMetadata("compiler/testData/codegen/boxInline/capture")
+    public static class Capture extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInCapture() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("captureInlinable.1.kt")
+        public void testCaptureInlinable() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+        }
+        
+        @TestMetadata("captureInlinableAndOther.1.kt")
+        public void testCaptureInlinableAndOther() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+        }
+        
+        @TestMetadata("captureThisAndReceiver.1.kt")
+        public void testCaptureThisAndReceiver() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+        }
+        
+        @TestMetadata("generics.1.kt")
+        public void testGenerics() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+        }
+        
+        @TestMetadata("simpleCapturingInClass.1.kt")
+        public void testSimpleCapturingInClass() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+        }
+        
+        @TestMetadata("simpleCapturingInPackage.1.kt")
+        public void testSimpleCapturingInPackage() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+        }
+        
     }
     
-    @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams")
-    public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams/");
+    @TestMetadata("compiler/testData/codegen/boxInline/complex")
+    public static class Complex extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInComplex() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("closureChain.1.kt")
+        public void testClosureChain() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+        }
+        
+        @TestMetadata("forEachLine.1.kt")
+        public void testForEachLine() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+        }
+        
+        @TestMetadata("lambdaInLambda.1.kt")
+        public void testLambdaInLambda() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+        }
+        
+        @TestMetadata("use.1.kt")
+        public void testUse() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/use.1.kt");
+        }
+        
+        @TestMetadata("with.1.kt")
+        public void testWith() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/with.1.kt");
+        }
+        
     }
     
-    @TestMetadata("builders")
-    public void testBuilders() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders/");
+    @TestMetadata("compiler/testData/codegen/boxInline/defaultValues")
+    public static class DefaultValues extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInDefaultValues() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("defaultMethod.1.kt")
+        public void testDefaultMethod() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+        }
+        
+        @TestMetadata("inlineInDefaultParameter.1.kt")
+        public void testInlineInDefaultParameter() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+        }
+        
+        @TestMetadata("simpleDefaultMethod.1.kt")
+        public void testSimpleDefaultMethod() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+        }
+        
     }
     
-    @TestMetadata("buildersAndLambdaCapturing")
-    public void testBuildersAndLambdaCapturing() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/buildersAndLambdaCapturing/");
+    @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash")
+    public static class LambdaClassClash extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInLambdaClassClash() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("lambdaClassClash.1.kt")
+        public void testLambdaClassClash() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+        }
+        
+        @TestMetadata("noInlineLambdaX2.1.kt")
+        public void testNoInlineLambdaX2() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+        }
+        
     }
     
-    @TestMetadata("captureInlinable")
-    public void testCaptureInlinable() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinable/");
+    @TestMetadata("compiler/testData/codegen/boxInline/lambdaTransformation")
+    public static class LambdaTransformation extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInLambdaTransformation() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("lambdaCloning.1.kt")
+        public void testLambdaCloning() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+        }
+        
+        @TestMetadata("lambdaInLambda2.1.kt")
+        public void testLambdaInLambda2() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+        }
+        
+        @TestMetadata("lambdaInLambdaNoInline.1.kt")
+        public void testLambdaInLambdaNoInline() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+        }
+        
+        @TestMetadata("regeneratedLambdaName.1.kt")
+        public void testRegeneratedLambdaName() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+        }
+        
+        @TestMetadata("sameCaptured.1.kt")
+        public void testSameCaptured() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+        }
+        
     }
     
-    @TestMetadata("captureInlinableAndOther")
-    public void testCaptureInlinableAndOther() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinableAndOther/");
+    @TestMetadata("compiler/testData/codegen/boxInline/localFunInLambda")
+    public static class LocalFunInLambda extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInLocalFunInLambda() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("localFunInLambda.1.kt")
+        public void testLocalFunInLambda() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+        }
+        
     }
     
-    @TestMetadata("captureThisAndReceiver")
-    public void testCaptureThisAndReceiver() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureThisAndReceiver/");
+    @TestMetadata("compiler/testData/codegen/boxInline/noInline")
+    public static class NoInline extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInNoInline() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("noInline.1.kt")
+        public void testNoInline() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+        }
+        
+        @TestMetadata("noInlineLambdaChain.1.kt")
+        public void testNoInlineLambdaChain() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+        }
+        
+        @TestMetadata("noInlineLambdaChainWithCapturedInline.1.kt")
+        public void testNoInlineLambdaChainWithCapturedInline() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+        }
+        
+        @TestMetadata("withoutInline.1.kt")
+        public void testWithoutInline() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+        }
+        
     }
     
-    @TestMetadata("classObject")
-    public void testClassObject() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/classObject/");
+    @TestMetadata("compiler/testData/codegen/boxInline/simple")
+    public static class Simple extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInSimple() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("classObject.1.kt")
+        public void testClassObject() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+        }
+        
+        @TestMetadata("extension.1.kt")
+        public void testExtension() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+        }
+        
+        @TestMetadata("params.1.kt")
+        public void testParams() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/params.1.kt");
+        }
+        
+        @TestMetadata("rootConstructor.1.kt")
+        public void testRootConstructor() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+        }
+        
+        @TestMetadata("severalClosures.1.kt")
+        public void testSeveralClosures() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+        }
+        
+        @TestMetadata("severalUsage.1.kt")
+        public void testSeveralUsage() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+        }
+        
+        @TestMetadata("simpleDouble.1.kt")
+        public void testSimpleDouble() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+        }
+        
+        @TestMetadata("simpleEnum.1.kt")
+        public void testSimpleEnum() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+        }
+        
+        @TestMetadata("simpleGenerics.1.kt")
+        public void testSimpleGenerics() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+        }
+        
+        @TestMetadata("simpleInt.1.kt")
+        public void testSimpleInt() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+        }
+        
+        @TestMetadata("simpleLambda.1.kt")
+        public void testSimpleLambda() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+        }
+        
+        @TestMetadata("simpleObject.1.kt")
+        public void testSimpleObject() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+        }
+        
+        @TestMetadata("vararg.1.kt")
+        public void testVararg() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+        }
+        
     }
     
-    @TestMetadata("closureChain")
-    public void testClosureChain() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/closureChain/");
+    @TestMetadata("compiler/testData/codegen/boxInline/special")
+    public static class Special extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInSpecial() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("identityCheck.1.kt")
+        public void testIdentityCheck() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+        }
+        
+        @TestMetadata("ifBranches.1.kt")
+        public void testIfBranches() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+        }
+        
+        @TestMetadata("iinc.1.kt")
+        public void testIinc() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+        }
+        
+        @TestMetadata("inlineChain.1.kt")
+        public void testInlineChain() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+        }
+        
+        @TestMetadata("plusAssign.1.kt")
+        public void testPlusAssign() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+        }
+        
+        @TestMetadata("stackHeightBug.1.kt")
+        public void testStackHeightBug() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+        }
+        
     }
     
-    @TestMetadata("defaultMethod")
-    public void testDefaultMethod() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultMethod/");
+    @TestMetadata("compiler/testData/codegen/boxInline/trait")
+    public static class Trait extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInTrait() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("trait.1.kt")
+        public void testTrait() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+        }
+        
     }
     
-    @TestMetadata("extension")
-    public void testExtension() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/extension/");
+    @TestMetadata("compiler/testData/codegen/boxInline/tryCatchFinally")
+    public static class TryCatchFinally extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInTryCatchFinally() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+        
+        @TestMetadata("tryCatch.1.kt")
+        public void testTryCatch() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+        }
+        
+        @TestMetadata("tryCatch2.1.kt")
+        public void testTryCatch2() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+        }
+        
+        @TestMetadata("tryCatchFinally.1.kt")
+        public void testTryCatchFinally() throws Exception {
+            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+        }
+        
     }
     
-    @TestMetadata("forEachLine")
-    public void testForEachLine() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/forEachLine/");
+    public static Test suite() {
+        TestSuite suite = new TestSuite("CompileKotlinAgainstInlineKotlinTestGenerated");
+        suite.addTestSuite(CompileKotlinAgainstInlineKotlinTestGenerated.class);
+        suite.addTestSuite(AnonymousObject.class);
+        suite.addTestSuite(Builders.class);
+        suite.addTestSuite(Capture.class);
+        suite.addTestSuite(Complex.class);
+        suite.addTestSuite(DefaultValues.class);
+        suite.addTestSuite(LambdaClassClash.class);
+        suite.addTestSuite(LambdaTransformation.class);
+        suite.addTestSuite(LocalFunInLambda.class);
+        suite.addTestSuite(NoInline.class);
+        suite.addTestSuite(Simple.class);
+        suite.addTestSuite(Special.class);
+        suite.addTestSuite(Trait.class);
+        suite.addTestSuite(TryCatchFinally.class);
+        return suite;
     }
-    
-    @TestMetadata("generics")
-    public void testGenerics() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/generics/");
-    }
-    
-    @TestMetadata("identityCheck")
-    public void testIdentityCheck() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/identityCheck/");
-    }
-    
-    @TestMetadata("ifBranches")
-    public void testIfBranches() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/ifBranches/");
-    }
-    
-    @TestMetadata("iinc")
-    public void testIinc() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/iinc/");
-    }
-    
-    @TestMetadata("inlineChain")
-    public void testInlineChain() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/inlineChain/");
-    }
-    
-    @TestMetadata("inlineInDefaultParameter")
-    public void testInlineInDefaultParameter() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/inlineInDefaultParameter/");
-    }
-    
-    @TestMetadata("lambdaClassClash")
-    public void testLambdaClassClash() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/");
-    }
-    
-    @TestMetadata("lambdaCloning")
-    public void testLambdaCloning() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaCloning/");
-    }
-    
-    @TestMetadata("lambdaInLambda")
-    public void testLambdaInLambda() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda/");
-    }
-    
-    @TestMetadata("lambdaInLambda2")
-    public void testLambdaInLambda2() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda2/");
-    }
-    
-    @TestMetadata("lambdaInLambdaNoInline")
-    public void testLambdaInLambdaNoInline() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambdaNoInline/");
-    }
-    
-    @TestMetadata("localFunInLambda")
-    public void testLocalFunInLambda() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/");
-    }
-    
-    @TestMetadata("noInline")
-    public void testNoInline() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/");
-    }
-    
-    @TestMetadata("noInlineLambdaChain")
-    public void testNoInlineLambdaChain() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChain/");
-    }
-    
-    @TestMetadata("noInlineLambdaChainWithCapturedInline")
-    public void testNoInlineLambdaChainWithCapturedInline() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline/");
-    }
-    
-    @TestMetadata("noInlineLambdaX2")
-    public void testNoInlineLambdaX2() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaX2/");
-    }
-    
-    @TestMetadata("params")
-    public void testParams() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/params/");
-    }
-    
-    @TestMetadata("plusAssign")
-    public void testPlusAssign() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/plusAssign/");
-    }
-    
-    @TestMetadata("regeneratedLambdaName")
-    public void testRegeneratedLambdaName() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/regeneratedLambdaName/");
-    }
-    
-    @TestMetadata("rootConstructor")
-    public void testRootConstructor() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/rootConstructor/");
-    }
-    
-    @TestMetadata("sameCaptured")
-    public void testSameCaptured() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/sameCaptured/");
-    }
-    
-    @TestMetadata("severalClosures")
-    public void testSeveralClosures() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/severalClosures/");
-    }
-    
-    @TestMetadata("severalUsage")
-    public void testSeveralUsage() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/severalUsage/");
-    }
-    
-    @TestMetadata("simpleCapturingInClass")
-    public void testSimpleCapturingInClass() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInClass/");
-    }
-    
-    @TestMetadata("simpleCapturingInPackage")
-    public void testSimpleCapturingInPackage() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInPackage/");
-    }
-    
-    @TestMetadata("simpleDefaultMethod")
-    public void testSimpleDefaultMethod() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleDefaultMethod/");
-    }
-    
-    @TestMetadata("simpleDouble")
-    public void testSimpleDouble() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleDouble/");
-    }
-    
-    @TestMetadata("simpleEnum")
-    public void testSimpleEnum() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleEnum/");
-    }
-    
-    @TestMetadata("simpleGenerics")
-    public void testSimpleGenerics() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleGenerics/");
-    }
-    
-    @TestMetadata("simpleInt")
-    public void testSimpleInt() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleInt/");
-    }
-    
-    @TestMetadata("simpleLambda")
-    public void testSimpleLambda() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleLambda/");
-    }
-    
-    @TestMetadata("simpleObject")
-    public void testSimpleObject() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleObject/");
-    }
-    
-    @TestMetadata("stackHeightBug")
-    public void testStackHeightBug() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/stackHeightBug/");
-    }
-    
-    @TestMetadata("trait")
-    public void testTrait() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/trait/");
-    }
-    
-    @TestMetadata("tryCatch")
-    public void testTryCatch() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch/");
-    }
-    
-    @TestMetadata("tryCatch2")
-    public void testTryCatch2() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch2/");
-    }
-    
-    @TestMetadata("tryCatchFinally")
-    public void testTryCatchFinally() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/");
-    }
-    
-    @TestMetadata("use")
-    public void testUse() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/use/");
-    }
-    
-    @TestMetadata("vararg")
-    public void testVararg() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/vararg/");
-    }
-    
-    @TestMetadata("with")
-    public void testWith() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/with/");
-    }
-    
-    @TestMetadata("withoutInline")
-    public void testWithoutInline() throws Exception {
-        doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/withoutInline/");
-    }
-    
 }
diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
index 916edb20269..54148edacd8 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
@@ -157,11 +157,11 @@ fun main(args: Array<String>) {
         }
 
         testClass(javaClass<AbstractBlackBoxCodegenTest>(), "BlackBoxInlineCodegenTestGenerated") {
-            model("codegen/boxInline", extension = null, recursive = false, testMethod = "doTestMultiFileWithInlineCheck")
+            model("codegen/boxInline", extension = "1.kt", testMethod = "doTestMultiFileWithInlineCheck")
         }
 
         testClass(javaClass<AbstractCompileKotlinAgainstKotlinTest>(), "CompileKotlinAgainstInlineKotlinTestGenerated") {
-            model("codegen/boxInline", extension = null, recursive = false, testMethod = "doBoxTestWithInlineCheck")
+            model("codegen/boxInline", extension = "1.kt", testMethod = "doBoxTestWithInlineCheck")
         }
 
         testClass(javaClass<AbstractBlackBoxCodegenTest>(), "BlackBoxMultiFileCodegenTestGenerated") {