diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
index d77c2ff1cec..2760902b94d 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
@@ -134,7 +134,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
             "TRY_CATCH type=${tryCatch.renderType()}"
 
     override fun visitDummyDeclaration(declaration: IrDummyDeclaration, data: Nothing?): String =
-            "DUMMY ${declaration.descriptor.name}"
+            "DUMMY ${declaration.descriptor.javaClass.simpleName} ${declaration.descriptor.name}"
 
     override fun visitDummyExpression(expression: IrDummyExpression, data: Nothing?): String =
             "DUMMY ${expression.description} type=${expression.renderType()}"
diff --git a/compiler/testData/ir/irText/classes/classMembers.kt b/compiler/testData/ir/irText/classes/classMembers.kt
new file mode 100644
index 00000000000..b5d045ae4cc
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/classMembers.kt
@@ -0,0 +1,39 @@
+class C(x: Int, val y: Int, var z: Int = 1) {
+    constructor() : this(0, 0, 0) {}
+
+    val property: Int = 0
+
+    val propertyWithGet: Int
+        get() = 42
+
+    var propertyWithGetAndSet: Int
+        get() = z
+        set(value) {
+            z = value
+        }
+
+    fun function() {
+        println("1")
+    }
+
+    fun Int.memberExtensionFunction() {
+        println("2")
+    }
+
+    class NestedClass {
+        fun function() {
+            println("3")
+        }
+
+        fun Int.memberExtensionFunction() {
+            println("4")
+        }
+    }
+
+    interface NestedInterface {
+        fun foo()
+        fun bar() = foo()
+    }
+
+    companion object
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/classes/classMembers.txt b/compiler/testData/ir/irText/classes/classMembers.txt
new file mode 100644
index 00000000000..b757c93332c
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/classMembers.txt
@@ -0,0 +1,49 @@
+FILE /classMembers.kt
+  CLASS CLASS C
+    PROPERTY public final val y: kotlin.Int getter=null setter=null
+    PROPERTY public final var z: kotlin.Int getter=null setter=null
+    DUMMY ConstructorDescriptorImpl <init>
+    PROPERTY public final val property: kotlin.Int = 0 getter=null setter=null
+      EXPRESSION_BODY
+        CONST Int type=kotlin.Int value='0'
+    PROPERTY public final val propertyWithGet: kotlin.Int getter=<get-propertyWithGet> setter=null
+    PROPERTY_GETTER public final fun <get-propertyWithGet>(): kotlin.Int property=propertyWithGet
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing
+          CONST Int type=kotlin.Int value='42'
+    PROPERTY public final var propertyWithGetAndSet: kotlin.Int getter=<get-propertyWithGetAndSet> setter=<set-propertyWithGetAndSet>
+    PROPERTY_GETTER public final fun <get-propertyWithGetAndSet>(): kotlin.Int property=propertyWithGetAndSet
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing
+          CALL .<get-z> type=kotlin.Int operator=GET_PROPERTY
+            $this: THIS public final class C type=C
+    PROPERTY_SETTER public final fun <set-propertyWithGetAndSet>(/*0*/ value: kotlin.Int): kotlin.Unit property=propertyWithGetAndSet
+      BLOCK_BODY
+        CALL .<set-z> type=kotlin.Unit operator=EQ
+          $this: THIS public final class C type=C
+          <set-?>: GET_VAR value type=kotlin.Int operator=null
+    FUN public final fun function(): kotlin.Unit
+      BLOCK_BODY
+        CALL .println type=kotlin.Unit operator=null
+          message: CONST String type=kotlin.String value='1'
+    FUN public final fun kotlin.Int.memberExtensionFunction(): kotlin.Unit
+      BLOCK_BODY
+        CALL .println type=kotlin.Unit operator=null
+          message: CONST String type=kotlin.String value='2'
+    CLASS CLASS NestedClass
+      FUN public final fun function(): kotlin.Unit
+        BLOCK_BODY
+          CALL .println type=kotlin.Unit operator=null
+            message: CONST String type=kotlin.String value='3'
+      FUN public final fun kotlin.Int.memberExtensionFunction(): kotlin.Unit
+        BLOCK_BODY
+          CALL .println type=kotlin.Unit operator=null
+            message: CONST String type=kotlin.String value='4'
+    CLASS INTERFACE NestedInterface
+      FUN public abstract fun foo(): kotlin.Unit
+      FUN public open fun bar(): kotlin.Unit
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing
+            CALL .foo type=kotlin.Unit operator=null
+              $this: THIS public interface NestedInterface type=C.NestedInterface
+    CLASS OBJECT Companion
diff --git a/compiler/testData/ir/irText/arrayAccess.kt b/compiler/testData/ir/irText/expressions/arrayAccess.kt
similarity index 100%
rename from compiler/testData/ir/irText/arrayAccess.kt
rename to compiler/testData/ir/irText/expressions/arrayAccess.kt
diff --git a/compiler/testData/ir/irText/arrayAccess.txt b/compiler/testData/ir/irText/expressions/arrayAccess.txt
similarity index 100%
rename from compiler/testData/ir/irText/arrayAccess.txt
rename to compiler/testData/ir/irText/expressions/arrayAccess.txt
diff --git a/compiler/testData/ir/irText/arrayAssignment.kt b/compiler/testData/ir/irText/expressions/arrayAssignment.kt
similarity index 100%
rename from compiler/testData/ir/irText/arrayAssignment.kt
rename to compiler/testData/ir/irText/expressions/arrayAssignment.kt
diff --git a/compiler/testData/ir/irText/arrayAssignment.txt b/compiler/testData/ir/irText/expressions/arrayAssignment.txt
similarity index 100%
rename from compiler/testData/ir/irText/arrayAssignment.txt
rename to compiler/testData/ir/irText/expressions/arrayAssignment.txt
diff --git a/compiler/testData/ir/irText/arrayAugmentedAssignment1.kt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.kt
similarity index 100%
rename from compiler/testData/ir/irText/arrayAugmentedAssignment1.kt
rename to compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.kt
diff --git a/compiler/testData/ir/irText/arrayAugmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
similarity index 100%
rename from compiler/testData/ir/irText/arrayAugmentedAssignment1.txt
rename to compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
diff --git a/compiler/testData/ir/irText/arrayAugmentedAssignment2.kt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.kt
similarity index 100%
rename from compiler/testData/ir/irText/arrayAugmentedAssignment2.kt
rename to compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.kt
diff --git a/compiler/testData/ir/irText/arrayAugmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt
similarity index 100%
rename from compiler/testData/ir/irText/arrayAugmentedAssignment2.txt
rename to compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt
diff --git a/compiler/testData/ir/irText/assignments.kt b/compiler/testData/ir/irText/expressions/assignments.kt
similarity index 100%
rename from compiler/testData/ir/irText/assignments.kt
rename to compiler/testData/ir/irText/expressions/assignments.kt
diff --git a/compiler/testData/ir/irText/assignments.txt b/compiler/testData/ir/irText/expressions/assignments.txt
similarity index 100%
rename from compiler/testData/ir/irText/assignments.txt
rename to compiler/testData/ir/irText/expressions/assignments.txt
diff --git a/compiler/testData/ir/irText/augmentedAssignment1.kt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.kt
similarity index 100%
rename from compiler/testData/ir/irText/augmentedAssignment1.kt
rename to compiler/testData/ir/irText/expressions/augmentedAssignment1.kt
diff --git a/compiler/testData/ir/irText/augmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
similarity index 100%
rename from compiler/testData/ir/irText/augmentedAssignment1.txt
rename to compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
diff --git a/compiler/testData/ir/irText/augmentedAssignment2.kt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt
similarity index 100%
rename from compiler/testData/ir/irText/augmentedAssignment2.kt
rename to compiler/testData/ir/irText/expressions/augmentedAssignment2.kt
diff --git a/compiler/testData/ir/irText/augmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
similarity index 100%
rename from compiler/testData/ir/irText/augmentedAssignment2.txt
rename to compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
diff --git a/compiler/testData/ir/irText/booleanOperators.kt b/compiler/testData/ir/irText/expressions/booleanOperators.kt
similarity index 100%
rename from compiler/testData/ir/irText/booleanOperators.kt
rename to compiler/testData/ir/irText/expressions/booleanOperators.kt
diff --git a/compiler/testData/ir/irText/booleanOperators.txt b/compiler/testData/ir/irText/expressions/booleanOperators.txt
similarity index 100%
rename from compiler/testData/ir/irText/booleanOperators.txt
rename to compiler/testData/ir/irText/expressions/booleanOperators.txt
diff --git a/compiler/testData/ir/irText/boxOk.kt b/compiler/testData/ir/irText/expressions/boxOk.kt
similarity index 100%
rename from compiler/testData/ir/irText/boxOk.kt
rename to compiler/testData/ir/irText/expressions/boxOk.kt
diff --git a/compiler/testData/ir/irText/boxOk.txt b/compiler/testData/ir/irText/expressions/boxOk.txt
similarity index 100%
rename from compiler/testData/ir/irText/boxOk.txt
rename to compiler/testData/ir/irText/expressions/boxOk.txt
diff --git a/compiler/testData/ir/irText/breakContinue.kt b/compiler/testData/ir/irText/expressions/breakContinue.kt
similarity index 100%
rename from compiler/testData/ir/irText/breakContinue.kt
rename to compiler/testData/ir/irText/expressions/breakContinue.kt
diff --git a/compiler/testData/ir/irText/breakContinue.txt b/compiler/testData/ir/irText/expressions/breakContinue.txt
similarity index 100%
rename from compiler/testData/ir/irText/breakContinue.txt
rename to compiler/testData/ir/irText/expressions/breakContinue.txt
diff --git a/compiler/testData/ir/irText/callWithReorderedArguments.kt b/compiler/testData/ir/irText/expressions/callWithReorderedArguments.kt
similarity index 100%
rename from compiler/testData/ir/irText/callWithReorderedArguments.kt
rename to compiler/testData/ir/irText/expressions/callWithReorderedArguments.kt
diff --git a/compiler/testData/ir/irText/callWithReorderedArguments.txt b/compiler/testData/ir/irText/expressions/callWithReorderedArguments.txt
similarity index 100%
rename from compiler/testData/ir/irText/callWithReorderedArguments.txt
rename to compiler/testData/ir/irText/expressions/callWithReorderedArguments.txt
diff --git a/compiler/testData/ir/irText/calls.kt b/compiler/testData/ir/irText/expressions/calls.kt
similarity index 100%
rename from compiler/testData/ir/irText/calls.kt
rename to compiler/testData/ir/irText/expressions/calls.kt
diff --git a/compiler/testData/ir/irText/calls.txt b/compiler/testData/ir/irText/expressions/calls.txt
similarity index 100%
rename from compiler/testData/ir/irText/calls.txt
rename to compiler/testData/ir/irText/expressions/calls.txt
diff --git a/compiler/testData/ir/irText/chainOfSafeCalls.kt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt
similarity index 100%
rename from compiler/testData/ir/irText/chainOfSafeCalls.kt
rename to compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt
diff --git a/compiler/testData/ir/irText/chainOfSafeCalls.txt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt
similarity index 100%
rename from compiler/testData/ir/irText/chainOfSafeCalls.txt
rename to compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt
diff --git a/compiler/testData/ir/irText/conventionComparisons.kt b/compiler/testData/ir/irText/expressions/conventionComparisons.kt
similarity index 100%
rename from compiler/testData/ir/irText/conventionComparisons.kt
rename to compiler/testData/ir/irText/expressions/conventionComparisons.kt
diff --git a/compiler/testData/ir/irText/conventionComparisons.txt b/compiler/testData/ir/irText/expressions/conventionComparisons.txt
similarity index 100%
rename from compiler/testData/ir/irText/conventionComparisons.txt
rename to compiler/testData/ir/irText/expressions/conventionComparisons.txt
diff --git a/compiler/testData/ir/irText/destructuring1.kt b/compiler/testData/ir/irText/expressions/destructuring1.kt
similarity index 100%
rename from compiler/testData/ir/irText/destructuring1.kt
rename to compiler/testData/ir/irText/expressions/destructuring1.kt
diff --git a/compiler/testData/ir/irText/destructuring1.txt b/compiler/testData/ir/irText/expressions/destructuring1.txt
similarity index 100%
rename from compiler/testData/ir/irText/destructuring1.txt
rename to compiler/testData/ir/irText/expressions/destructuring1.txt
diff --git a/compiler/testData/ir/irText/dotQualified.kt b/compiler/testData/ir/irText/expressions/dotQualified.kt
similarity index 100%
rename from compiler/testData/ir/irText/dotQualified.kt
rename to compiler/testData/ir/irText/expressions/dotQualified.kt
diff --git a/compiler/testData/ir/irText/dotQualified.txt b/compiler/testData/ir/irText/expressions/dotQualified.txt
similarity index 100%
rename from compiler/testData/ir/irText/dotQualified.txt
rename to compiler/testData/ir/irText/expressions/dotQualified.txt
diff --git a/compiler/testData/ir/irText/elvis.kt b/compiler/testData/ir/irText/expressions/elvis.kt
similarity index 100%
rename from compiler/testData/ir/irText/elvis.kt
rename to compiler/testData/ir/irText/expressions/elvis.kt
diff --git a/compiler/testData/ir/irText/elvis.txt b/compiler/testData/ir/irText/expressions/elvis.txt
similarity index 100%
rename from compiler/testData/ir/irText/elvis.txt
rename to compiler/testData/ir/irText/expressions/elvis.txt
diff --git a/compiler/testData/ir/irText/equality.kt b/compiler/testData/ir/irText/expressions/equality.kt
similarity index 100%
rename from compiler/testData/ir/irText/equality.kt
rename to compiler/testData/ir/irText/expressions/equality.kt
diff --git a/compiler/testData/ir/irText/equality.txt b/compiler/testData/ir/irText/expressions/equality.txt
similarity index 100%
rename from compiler/testData/ir/irText/equality.txt
rename to compiler/testData/ir/irText/expressions/equality.txt
diff --git a/compiler/testData/ir/irText/extensionPropertyGetterCall.kt b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.kt
similarity index 100%
rename from compiler/testData/ir/irText/extensionPropertyGetterCall.kt
rename to compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.kt
diff --git a/compiler/testData/ir/irText/extensionPropertyGetterCall.txt b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
similarity index 100%
rename from compiler/testData/ir/irText/extensionPropertyGetterCall.txt
rename to compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
diff --git a/compiler/testData/ir/irText/for.kt b/compiler/testData/ir/irText/expressions/for.kt
similarity index 100%
rename from compiler/testData/ir/irText/for.kt
rename to compiler/testData/ir/irText/expressions/for.kt
diff --git a/compiler/testData/ir/irText/for.txt b/compiler/testData/ir/irText/expressions/for.txt
similarity index 100%
rename from compiler/testData/ir/irText/for.txt
rename to compiler/testData/ir/irText/expressions/for.txt
diff --git a/compiler/testData/ir/irText/forWithBreakContinue.kt b/compiler/testData/ir/irText/expressions/forWithBreakContinue.kt
similarity index 100%
rename from compiler/testData/ir/irText/forWithBreakContinue.kt
rename to compiler/testData/ir/irText/expressions/forWithBreakContinue.kt
diff --git a/compiler/testData/ir/irText/forWithBreakContinue.txt b/compiler/testData/ir/irText/expressions/forWithBreakContinue.txt
similarity index 100%
rename from compiler/testData/ir/irText/forWithBreakContinue.txt
rename to compiler/testData/ir/irText/expressions/forWithBreakContinue.txt
diff --git a/compiler/testData/ir/irText/forWithImplicitReceivers.kt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.kt
similarity index 100%
rename from compiler/testData/ir/irText/forWithImplicitReceivers.kt
rename to compiler/testData/ir/irText/expressions/forWithImplicitReceivers.kt
diff --git a/compiler/testData/ir/irText/forWithImplicitReceivers.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
similarity index 100%
rename from compiler/testData/ir/irText/forWithImplicitReceivers.txt
rename to compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
diff --git a/compiler/testData/ir/irText/identity.kt b/compiler/testData/ir/irText/expressions/identity.kt
similarity index 100%
rename from compiler/testData/ir/irText/identity.kt
rename to compiler/testData/ir/irText/expressions/identity.kt
diff --git a/compiler/testData/ir/irText/identity.txt b/compiler/testData/ir/irText/expressions/identity.txt
similarity index 100%
rename from compiler/testData/ir/irText/identity.txt
rename to compiler/testData/ir/irText/expressions/identity.txt
diff --git a/compiler/testData/ir/irText/ifElseIf.kt b/compiler/testData/ir/irText/expressions/ifElseIf.kt
similarity index 100%
rename from compiler/testData/ir/irText/ifElseIf.kt
rename to compiler/testData/ir/irText/expressions/ifElseIf.kt
diff --git a/compiler/testData/ir/irText/ifElseIf.txt b/compiler/testData/ir/irText/expressions/ifElseIf.txt
similarity index 100%
rename from compiler/testData/ir/irText/ifElseIf.txt
rename to compiler/testData/ir/irText/expressions/ifElseIf.txt
diff --git a/compiler/testData/ir/irText/implicitCastOnPlatformType.kt b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.kt
similarity index 100%
rename from compiler/testData/ir/irText/implicitCastOnPlatformType.kt
rename to compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.kt
diff --git a/compiler/testData/ir/irText/implicitCastOnPlatformType.txt b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt
similarity index 100%
rename from compiler/testData/ir/irText/implicitCastOnPlatformType.txt
rename to compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt
diff --git a/compiler/testData/ir/irText/in.kt b/compiler/testData/ir/irText/expressions/in.kt
similarity index 100%
rename from compiler/testData/ir/irText/in.kt
rename to compiler/testData/ir/irText/expressions/in.kt
diff --git a/compiler/testData/ir/irText/in.txt b/compiler/testData/ir/irText/expressions/in.txt
similarity index 100%
rename from compiler/testData/ir/irText/in.txt
rename to compiler/testData/ir/irText/expressions/in.txt
diff --git a/compiler/testData/ir/irText/incrementDecrement.kt b/compiler/testData/ir/irText/expressions/incrementDecrement.kt
similarity index 100%
rename from compiler/testData/ir/irText/incrementDecrement.kt
rename to compiler/testData/ir/irText/expressions/incrementDecrement.kt
diff --git a/compiler/testData/ir/irText/incrementDecrement.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.txt
similarity index 100%
rename from compiler/testData/ir/irText/incrementDecrement.txt
rename to compiler/testData/ir/irText/expressions/incrementDecrement.txt
diff --git a/compiler/testData/ir/irText/literals.kt b/compiler/testData/ir/irText/expressions/literals.kt
similarity index 100%
rename from compiler/testData/ir/irText/literals.kt
rename to compiler/testData/ir/irText/expressions/literals.kt
diff --git a/compiler/testData/ir/irText/literals.txt b/compiler/testData/ir/irText/expressions/literals.txt
similarity index 100%
rename from compiler/testData/ir/irText/literals.txt
rename to compiler/testData/ir/irText/expressions/literals.txt
diff --git a/compiler/testData/ir/irText/primitiveComparisons.kt b/compiler/testData/ir/irText/expressions/primitiveComparisons.kt
similarity index 100%
rename from compiler/testData/ir/irText/primitiveComparisons.kt
rename to compiler/testData/ir/irText/expressions/primitiveComparisons.kt
diff --git a/compiler/testData/ir/irText/primitiveComparisons.txt b/compiler/testData/ir/irText/expressions/primitiveComparisons.txt
similarity index 100%
rename from compiler/testData/ir/irText/primitiveComparisons.txt
rename to compiler/testData/ir/irText/expressions/primitiveComparisons.txt
diff --git a/compiler/testData/ir/irText/references.kt b/compiler/testData/ir/irText/expressions/references.kt
similarity index 100%
rename from compiler/testData/ir/irText/references.kt
rename to compiler/testData/ir/irText/expressions/references.kt
diff --git a/compiler/testData/ir/irText/references.txt b/compiler/testData/ir/irText/expressions/references.txt
similarity index 100%
rename from compiler/testData/ir/irText/references.txt
rename to compiler/testData/ir/irText/expressions/references.txt
diff --git a/compiler/testData/ir/irText/safeCallWithIncrementDecrement.kt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt
similarity index 100%
rename from compiler/testData/ir/irText/safeCallWithIncrementDecrement.kt
rename to compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt
diff --git a/compiler/testData/ir/irText/safeCallWithIncrementDecrement.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
similarity index 100%
rename from compiler/testData/ir/irText/safeCallWithIncrementDecrement.txt
rename to compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
diff --git a/compiler/testData/ir/irText/safeCalls.kt b/compiler/testData/ir/irText/expressions/safeCalls.kt
similarity index 100%
rename from compiler/testData/ir/irText/safeCalls.kt
rename to compiler/testData/ir/irText/expressions/safeCalls.kt
diff --git a/compiler/testData/ir/irText/safeCalls.txt b/compiler/testData/ir/irText/expressions/safeCalls.txt
similarity index 100%
rename from compiler/testData/ir/irText/safeCalls.txt
rename to compiler/testData/ir/irText/expressions/safeCalls.txt
diff --git a/compiler/testData/ir/irText/simpleOperators.kt b/compiler/testData/ir/irText/expressions/simpleOperators.kt
similarity index 100%
rename from compiler/testData/ir/irText/simpleOperators.kt
rename to compiler/testData/ir/irText/expressions/simpleOperators.kt
diff --git a/compiler/testData/ir/irText/simpleOperators.txt b/compiler/testData/ir/irText/expressions/simpleOperators.txt
similarity index 100%
rename from compiler/testData/ir/irText/simpleOperators.txt
rename to compiler/testData/ir/irText/expressions/simpleOperators.txt
diff --git a/compiler/testData/ir/irText/simpleUnaryOperators.kt b/compiler/testData/ir/irText/expressions/simpleUnaryOperators.kt
similarity index 100%
rename from compiler/testData/ir/irText/simpleUnaryOperators.kt
rename to compiler/testData/ir/irText/expressions/simpleUnaryOperators.kt
diff --git a/compiler/testData/ir/irText/simpleUnaryOperators.txt b/compiler/testData/ir/irText/expressions/simpleUnaryOperators.txt
similarity index 100%
rename from compiler/testData/ir/irText/simpleUnaryOperators.txt
rename to compiler/testData/ir/irText/expressions/simpleUnaryOperators.txt
diff --git a/compiler/testData/ir/irText/smartCasts.kt b/compiler/testData/ir/irText/expressions/smartCasts.kt
similarity index 100%
rename from compiler/testData/ir/irText/smartCasts.kt
rename to compiler/testData/ir/irText/expressions/smartCasts.kt
diff --git a/compiler/testData/ir/irText/smartCasts.txt b/compiler/testData/ir/irText/expressions/smartCasts.txt
similarity index 100%
rename from compiler/testData/ir/irText/smartCasts.txt
rename to compiler/testData/ir/irText/expressions/smartCasts.txt
diff --git a/compiler/testData/ir/irText/smartCastsWithDestructuring.kt b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.kt
similarity index 100%
rename from compiler/testData/ir/irText/smartCastsWithDestructuring.kt
rename to compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.kt
diff --git a/compiler/testData/ir/irText/smartCastsWithDestructuring.txt b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt
similarity index 100%
rename from compiler/testData/ir/irText/smartCastsWithDestructuring.txt
rename to compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt
diff --git a/compiler/testData/ir/irText/smoke.kt b/compiler/testData/ir/irText/expressions/smoke.kt
similarity index 100%
rename from compiler/testData/ir/irText/smoke.kt
rename to compiler/testData/ir/irText/expressions/smoke.kt
diff --git a/compiler/testData/ir/irText/smoke.txt b/compiler/testData/ir/irText/expressions/smoke.txt
similarity index 100%
rename from compiler/testData/ir/irText/smoke.txt
rename to compiler/testData/ir/irText/expressions/smoke.txt
diff --git a/compiler/testData/ir/irText/stringComparisons.kt b/compiler/testData/ir/irText/expressions/stringComparisons.kt
similarity index 100%
rename from compiler/testData/ir/irText/stringComparisons.kt
rename to compiler/testData/ir/irText/expressions/stringComparisons.kt
diff --git a/compiler/testData/ir/irText/stringComparisons.txt b/compiler/testData/ir/irText/expressions/stringComparisons.txt
similarity index 100%
rename from compiler/testData/ir/irText/stringComparisons.txt
rename to compiler/testData/ir/irText/expressions/stringComparisons.txt
diff --git a/compiler/testData/ir/irText/stringPlus.kt b/compiler/testData/ir/irText/expressions/stringPlus.kt
similarity index 100%
rename from compiler/testData/ir/irText/stringPlus.kt
rename to compiler/testData/ir/irText/expressions/stringPlus.kt
diff --git a/compiler/testData/ir/irText/stringPlus.txt b/compiler/testData/ir/irText/expressions/stringPlus.txt
similarity index 100%
rename from compiler/testData/ir/irText/stringPlus.txt
rename to compiler/testData/ir/irText/expressions/stringPlus.txt
diff --git a/compiler/testData/ir/irText/throw.kt b/compiler/testData/ir/irText/expressions/throw.kt
similarity index 100%
rename from compiler/testData/ir/irText/throw.kt
rename to compiler/testData/ir/irText/expressions/throw.kt
diff --git a/compiler/testData/ir/irText/throw.txt b/compiler/testData/ir/irText/expressions/throw.txt
similarity index 100%
rename from compiler/testData/ir/irText/throw.txt
rename to compiler/testData/ir/irText/expressions/throw.txt
diff --git a/compiler/testData/ir/irText/tryCatch.kt b/compiler/testData/ir/irText/expressions/tryCatch.kt
similarity index 100%
rename from compiler/testData/ir/irText/tryCatch.kt
rename to compiler/testData/ir/irText/expressions/tryCatch.kt
diff --git a/compiler/testData/ir/irText/tryCatch.txt b/compiler/testData/ir/irText/expressions/tryCatch.txt
similarity index 100%
rename from compiler/testData/ir/irText/tryCatch.txt
rename to compiler/testData/ir/irText/expressions/tryCatch.txt
diff --git a/compiler/testData/ir/irText/tryCatchWithImplicitCast.kt b/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.kt
similarity index 100%
rename from compiler/testData/ir/irText/tryCatchWithImplicitCast.kt
rename to compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.kt
diff --git a/compiler/testData/ir/irText/tryCatchWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt
similarity index 100%
rename from compiler/testData/ir/irText/tryCatchWithImplicitCast.txt
rename to compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt
diff --git a/compiler/testData/ir/irText/typeOperators.kt b/compiler/testData/ir/irText/expressions/typeOperators.kt
similarity index 100%
rename from compiler/testData/ir/irText/typeOperators.kt
rename to compiler/testData/ir/irText/expressions/typeOperators.kt
diff --git a/compiler/testData/ir/irText/typeOperators.txt b/compiler/testData/ir/irText/expressions/typeOperators.txt
similarity index 100%
rename from compiler/testData/ir/irText/typeOperators.txt
rename to compiler/testData/ir/irText/expressions/typeOperators.txt
diff --git a/compiler/testData/ir/irText/values.kt b/compiler/testData/ir/irText/expressions/values.kt
similarity index 100%
rename from compiler/testData/ir/irText/values.kt
rename to compiler/testData/ir/irText/expressions/values.kt
diff --git a/compiler/testData/ir/irText/values.txt b/compiler/testData/ir/irText/expressions/values.txt
similarity index 100%
rename from compiler/testData/ir/irText/values.txt
rename to compiler/testData/ir/irText/expressions/values.txt
diff --git a/compiler/testData/ir/irText/vararg.kt b/compiler/testData/ir/irText/expressions/vararg.kt
similarity index 100%
rename from compiler/testData/ir/irText/vararg.kt
rename to compiler/testData/ir/irText/expressions/vararg.kt
diff --git a/compiler/testData/ir/irText/vararg.txt b/compiler/testData/ir/irText/expressions/vararg.txt
similarity index 100%
rename from compiler/testData/ir/irText/vararg.txt
rename to compiler/testData/ir/irText/expressions/vararg.txt
diff --git a/compiler/testData/ir/irText/varargWithImplicitCast.kt b/compiler/testData/ir/irText/expressions/varargWithImplicitCast.kt
similarity index 100%
rename from compiler/testData/ir/irText/varargWithImplicitCast.kt
rename to compiler/testData/ir/irText/expressions/varargWithImplicitCast.kt
diff --git a/compiler/testData/ir/irText/varargWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/varargWithImplicitCast.txt
similarity index 100%
rename from compiler/testData/ir/irText/varargWithImplicitCast.txt
rename to compiler/testData/ir/irText/expressions/varargWithImplicitCast.txt
diff --git a/compiler/testData/ir/irText/variableAsFunctionCall.kt b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.kt
similarity index 100%
rename from compiler/testData/ir/irText/variableAsFunctionCall.kt
rename to compiler/testData/ir/irText/expressions/variableAsFunctionCall.kt
diff --git a/compiler/testData/ir/irText/variableAsFunctionCall.txt b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt
similarity index 100%
rename from compiler/testData/ir/irText/variableAsFunctionCall.txt
rename to compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt
diff --git a/compiler/testData/ir/irText/when.kt b/compiler/testData/ir/irText/expressions/when.kt
similarity index 100%
rename from compiler/testData/ir/irText/when.kt
rename to compiler/testData/ir/irText/expressions/when.kt
diff --git a/compiler/testData/ir/irText/when.txt b/compiler/testData/ir/irText/expressions/when.txt
similarity index 100%
rename from compiler/testData/ir/irText/when.txt
rename to compiler/testData/ir/irText/expressions/when.txt
diff --git a/compiler/testData/ir/irText/whileDoWhile.kt b/compiler/testData/ir/irText/expressions/whileDoWhile.kt
similarity index 100%
rename from compiler/testData/ir/irText/whileDoWhile.kt
rename to compiler/testData/ir/irText/expressions/whileDoWhile.kt
diff --git a/compiler/testData/ir/irText/whileDoWhile.txt b/compiler/testData/ir/irText/expressions/whileDoWhile.txt
similarity index 100%
rename from compiler/testData/ir/irText/whileDoWhile.txt
rename to compiler/testData/ir/irText/expressions/whileDoWhile.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
index fd904561a1d..0a91c993a17 100644
--- a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
@@ -35,297 +35,321 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
-    @TestMetadata("arrayAccess.kt")
-    public void testArrayAccess() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/arrayAccess.kt");
-        doTest(fileName);
+    @TestMetadata("compiler/testData/ir/irText/classes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Classes extends AbstractIrTextTestCase {
+        public void testAllFilesPresentInClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/ir/irText/classes"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("classMembers.kt")
+        public void testClassMembers() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/classes/classMembers.kt");
+            doTest(fileName);
+        }
     }
 
-    @TestMetadata("arrayAssignment.kt")
-    public void testArrayAssignment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/arrayAssignment.kt");
-        doTest(fileName);
-    }
+    @TestMetadata("compiler/testData/ir/irText/expressions")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Expressions extends AbstractIrTextTestCase {
+        public void testAllFilesPresentInExpressions() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/ir/irText/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
 
-    @TestMetadata("arrayAugmentedAssignment1.kt")
-    public void testArrayAugmentedAssignment1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/arrayAugmentedAssignment1.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("arrayAccess.kt")
+        public void testArrayAccess() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/arrayAccess.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("arrayAugmentedAssignment2.kt")
-    public void testArrayAugmentedAssignment2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/arrayAugmentedAssignment2.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("arrayAssignment.kt")
+        public void testArrayAssignment() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/arrayAssignment.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("assignments.kt")
-    public void testAssignments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/assignments.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("arrayAugmentedAssignment1.kt")
+        public void testArrayAugmentedAssignment1() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("augmentedAssignment1.kt")
-    public void testAugmentedAssignment1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/augmentedAssignment1.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("arrayAugmentedAssignment2.kt")
+        public void testArrayAugmentedAssignment2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("augmentedAssignment2.kt")
-    public void testAugmentedAssignment2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/augmentedAssignment2.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("assignments.kt")
+        public void testAssignments() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/assignments.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("booleanOperators.kt")
-    public void testBooleanOperators() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/booleanOperators.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("augmentedAssignment1.kt")
+        public void testAugmentedAssignment1() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/augmentedAssignment1.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("boxOk.kt")
-    public void testBoxOk() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/boxOk.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("augmentedAssignment2.kt")
+        public void testAugmentedAssignment2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/augmentedAssignment2.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("breakContinue.kt")
-    public void testBreakContinue() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/breakContinue.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("booleanOperators.kt")
+        public void testBooleanOperators() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/booleanOperators.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("callWithReorderedArguments.kt")
-    public void testCallWithReorderedArguments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/callWithReorderedArguments.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("boxOk.kt")
+        public void testBoxOk() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/boxOk.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("calls.kt")
-    public void testCalls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/calls.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("breakContinue.kt")
+        public void testBreakContinue() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/breakContinue.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("chainOfSafeCalls.kt")
-    public void testChainOfSafeCalls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/chainOfSafeCalls.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("callWithReorderedArguments.kt")
+        public void testCallWithReorderedArguments() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/callWithReorderedArguments.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("conventionComparisons.kt")
-    public void testConventionComparisons() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/conventionComparisons.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("calls.kt")
+        public void testCalls() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/calls.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("destructuring1.kt")
-    public void testDestructuring1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/destructuring1.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("chainOfSafeCalls.kt")
+        public void testChainOfSafeCalls() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("dotQualified.kt")
-    public void testDotQualified() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/dotQualified.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("conventionComparisons.kt")
+        public void testConventionComparisons() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/conventionComparisons.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("elvis.kt")
-    public void testElvis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/elvis.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("destructuring1.kt")
+        public void testDestructuring1() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/destructuring1.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("equality.kt")
-    public void testEquality() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/equality.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("dotQualified.kt")
+        public void testDotQualified() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/dotQualified.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("extensionPropertyGetterCall.kt")
-    public void testExtensionPropertyGetterCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/extensionPropertyGetterCall.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("elvis.kt")
+        public void testElvis() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/elvis.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("for.kt")
-    public void testFor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/for.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("equality.kt")
+        public void testEquality() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/equality.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("forWithBreakContinue.kt")
-    public void testForWithBreakContinue() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/forWithBreakContinue.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("extensionPropertyGetterCall.kt")
+        public void testExtensionPropertyGetterCall() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("forWithImplicitReceivers.kt")
-    public void testForWithImplicitReceivers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/forWithImplicitReceivers.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("for.kt")
+        public void testFor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/for.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("identity.kt")
-    public void testIdentity() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/identity.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("forWithBreakContinue.kt")
+        public void testForWithBreakContinue() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/forWithBreakContinue.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("ifElseIf.kt")
-    public void testIfElseIf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/ifElseIf.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("forWithImplicitReceivers.kt")
+        public void testForWithImplicitReceivers() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/forWithImplicitReceivers.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("implicitCastOnPlatformType.kt")
-    public void testImplicitCastOnPlatformType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/implicitCastOnPlatformType.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("identity.kt")
+        public void testIdentity() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/identity.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("in.kt")
-    public void testIn() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/in.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("ifElseIf.kt")
+        public void testIfElseIf() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/ifElseIf.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("incrementDecrement.kt")
-    public void testIncrementDecrement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/incrementDecrement.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("implicitCastOnPlatformType.kt")
+        public void testImplicitCastOnPlatformType() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("literals.kt")
-    public void testLiterals() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/literals.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("in.kt")
+        public void testIn() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/in.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("primitiveComparisons.kt")
-    public void testPrimitiveComparisons() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/primitiveComparisons.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("incrementDecrement.kt")
+        public void testIncrementDecrement() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/incrementDecrement.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("references.kt")
-    public void testReferences() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/references.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("literals.kt")
+        public void testLiterals() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/literals.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("safeCallWithIncrementDecrement.kt")
-    public void testSafeCallWithIncrementDecrement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/safeCallWithIncrementDecrement.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("primitiveComparisons.kt")
+        public void testPrimitiveComparisons() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/primitiveComparisons.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("safeCalls.kt")
-    public void testSafeCalls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/safeCalls.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("references.kt")
+        public void testReferences() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/references.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("simpleOperators.kt")
-    public void testSimpleOperators() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/simpleOperators.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("safeCallWithIncrementDecrement.kt")
+        public void testSafeCallWithIncrementDecrement() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("simpleUnaryOperators.kt")
-    public void testSimpleUnaryOperators() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/simpleUnaryOperators.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("safeCalls.kt")
+        public void testSafeCalls() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/safeCalls.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("smartCasts.kt")
-    public void testSmartCasts() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/smartCasts.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("simpleOperators.kt")
+        public void testSimpleOperators() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/simpleOperators.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("smartCastsWithDestructuring.kt")
-    public void testSmartCastsWithDestructuring() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/smartCastsWithDestructuring.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("simpleUnaryOperators.kt")
+        public void testSimpleUnaryOperators() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/simpleUnaryOperators.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("smoke.kt")
-    public void testSmoke() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/smoke.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("smartCasts.kt")
+        public void testSmartCasts() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/smartCasts.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("stringComparisons.kt")
-    public void testStringComparisons() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/stringComparisons.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("smartCastsWithDestructuring.kt")
+        public void testSmartCastsWithDestructuring() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("stringPlus.kt")
-    public void testStringPlus() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/stringPlus.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("smoke.kt")
+        public void testSmoke() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/smoke.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("throw.kt")
-    public void testThrow() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/throw.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("stringComparisons.kt")
+        public void testStringComparisons() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/stringComparisons.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("tryCatch.kt")
-    public void testTryCatch() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/tryCatch.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/stringPlus.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("tryCatchWithImplicitCast.kt")
-    public void testTryCatchWithImplicitCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/tryCatchWithImplicitCast.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("throw.kt")
+        public void testThrow() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/throw.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("typeOperators.kt")
-    public void testTypeOperators() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/typeOperators.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("tryCatch.kt")
+        public void testTryCatch() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/tryCatch.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("values.kt")
-    public void testValues() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/values.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("tryCatchWithImplicitCast.kt")
+        public void testTryCatchWithImplicitCast() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("vararg.kt")
-    public void testVararg() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/vararg.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("typeOperators.kt")
+        public void testTypeOperators() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/typeOperators.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("varargWithImplicitCast.kt")
-    public void testVarargWithImplicitCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/varargWithImplicitCast.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("values.kt")
+        public void testValues() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/values.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("variableAsFunctionCall.kt")
-    public void testVariableAsFunctionCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/variableAsFunctionCall.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("vararg.kt")
+        public void testVararg() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/vararg.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("when.kt")
-    public void testWhen() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/when.kt");
-        doTest(fileName);
-    }
+        @TestMetadata("varargWithImplicitCast.kt")
+        public void testVarargWithImplicitCast() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/varargWithImplicitCast.kt");
+            doTest(fileName);
+        }
 
-    @TestMetadata("whileDoWhile.kt")
-    public void testWhileDoWhile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/whileDoWhile.kt");
-        doTest(fileName);
+        @TestMetadata("variableAsFunctionCall.kt")
+        public void testVariableAsFunctionCall() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/variableAsFunctionCall.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("when.kt")
+        public void testWhen() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/when.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("whileDoWhile.kt")
+        public void testWhileDoWhile() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/expressions/whileDoWhile.kt");
+            doTest(fileName);
+        }
     }
 }