diff --git a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
index 8906c793fec..1741520cb27 100644
--- a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
+++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
@@ -46,8 +46,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     else if (javaFile.getParent().endsWith("/method")) actual = methodToSingleLineKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/method_mult")) actual = methodToKotlin(javaCode);
 
-    else if (javaFile.getParent().endsWith("/class")) actual = classToSingleLineKotlin(javaCode);
-    else if (javaFile.getParent().endsWith("/class_mult")) actual = classToKotlin(javaCode);
+    else if (javaFile.getParent().endsWith("/class")) actual = classToKotlin(javaCode);
 
     else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode);
 
@@ -112,11 +111,15 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(result);
   }
 
-  @NotNull
-  protected String classToSingleLineKotlin(String text) throws IOException {
-    return toSingleLine(classToKotlin(text));
+  protected String methodToSingleLineKotlin(String text) throws IOException {
+    return toSingleLine(methodToKotlin(text));
   }
 
+  protected String statementToSingleLineKotlin(String code) throws Exception {
+    return toSingleLine(statementToKotlin(code));
+  }
+
+  @NotNull
   protected String methodToKotlin(String text) throws IOException {
     String result = classToKotlin("final class C {" + text + "}")
       .replaceAll("class C \\{", "");
@@ -124,10 +127,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(result);
   }
 
-  protected String methodToSingleLineKotlin(String text) throws IOException {
-    return toSingleLine(methodToKotlin(text));
-  }
-
+  @NotNull
   protected String statementToKotlin(String text) throws Exception {
     String result = methodToKotlin("void main() {" + text + "}");
     int pos = result.lastIndexOf("}");
@@ -135,10 +135,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(result);
   }
 
-  protected String statementToSingleLineKotlin(String code) throws Exception {
-    return toSingleLine(statementToKotlin(code));
-  }
-
+  @NotNull
   protected String expressionToKotlin(String code) throws Exception {
     String result = statementToKotlin("Object o =" + code + "}");
     result = result.replaceFirst("var o : Any\\? =", "");
diff --git a/testData/ast/class/class/class.kt b/testData/ast/class/class/class.kt
index 503cbe46e7f..23873d0aaa3 100644
--- a/testData/ast/class/class/class.kt
+++ b/testData/ast/class/class/class.kt
@@ -1 +1,2 @@
-open class Test { }
\ No newline at end of file
+open class Test {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class_mult/classWithEmptyMethods.jav b/testData/ast/class/class/classWithEmptyMethods.jav
similarity index 100%
rename from testData/ast/class/class_mult/classWithEmptyMethods.jav
rename to testData/ast/class/class/classWithEmptyMethods.jav
diff --git a/testData/ast/class/class_mult/classWithEmptyMethods.kt b/testData/ast/class/class/classWithEmptyMethods.kt
similarity index 100%
rename from testData/ast/class/class_mult/classWithEmptyMethods.kt
rename to testData/ast/class/class/classWithEmptyMethods.kt
diff --git a/testData/ast/class/class_mult/classWithFields.jav b/testData/ast/class/class/classWithFields.jav
similarity index 100%
rename from testData/ast/class/class_mult/classWithFields.jav
rename to testData/ast/class/class/classWithFields.jav
diff --git a/testData/ast/class/class_mult/classWithFields.kt b/testData/ast/class/class/classWithFields.kt
similarity index 100%
rename from testData/ast/class/class_mult/classWithFields.kt
rename to testData/ast/class/class/classWithFields.kt
diff --git a/testData/ast/class/class_mult/classWithMultiplyFields.jav b/testData/ast/class/class/classWithMultiplyFields.jav
similarity index 100%
rename from testData/ast/class/class_mult/classWithMultiplyFields.jav
rename to testData/ast/class/class/classWithMultiplyFields.jav
diff --git a/testData/ast/class/class_mult/classWithMultiplyFields.kt b/testData/ast/class/class/classWithMultiplyFields.kt
similarity index 100%
rename from testData/ast/class/class_mult/classWithMultiplyFields.kt
rename to testData/ast/class/class/classWithMultiplyFields.kt
diff --git a/testData/ast/class/class/emptyClass.kt b/testData/ast/class/class/emptyClass.kt
index 0e9ef9e73c2..a7ca22abab4 100644
--- a/testData/ast/class/class/emptyClass.kt
+++ b/testData/ast/class/class/emptyClass.kt
@@ -1 +1,2 @@
-class A { }
\ No newline at end of file
+class A {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt b/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt
index 4bb2a7ab769..0567238ee84 100644
--- a/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt
+++ b/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt
@@ -1 +1,2 @@
-class A : Base, I { }
\ No newline at end of file
+class A : Base, I {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt
index e86ee0f0518..dc9dddf3cba 100644
--- a/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ b/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -1 +1,2 @@
-class A : Base, I0, I1, I2 { }
\ No newline at end of file
+class A : Base, I0, I1, I2 {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/finalClass.kt b/testData/ast/class/class/finalClass.kt
index 5a0c97725b1..96d83e0c503 100644
--- a/testData/ast/class/class/finalClass.kt
+++ b/testData/ast/class/class/finalClass.kt
@@ -1 +1,2 @@
-class Test { }
\ No newline at end of file
+class Test {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/genericClass.kt b/testData/ast/class/class/genericClass.kt
index e7612b27f50..3bdd861a5fd 100644
--- a/testData/ast/class/class/genericClass.kt
+++ b/testData/ast/class/class/genericClass.kt
@@ -1 +1,2 @@
-class Entry<K, V> { }
\ No newline at end of file
+class Entry<K, V> {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/innerEmptyClass.kt b/testData/ast/class/class/innerEmptyClass.kt
index 630943255b1..22bcf13b976 100644
--- a/testData/ast/class/class/innerEmptyClass.kt
+++ b/testData/ast/class/class/innerEmptyClass.kt
@@ -1 +1,4 @@
-class A { class B { } }
\ No newline at end of file
+class A {
+class B {
+}
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/innerStaticClass.kt b/testData/ast/class/class/innerStaticClass.kt
index 0041dfabfdd..96ce2d1beab 100644
--- a/testData/ast/class/class/innerStaticClass.kt
+++ b/testData/ast/class/class/innerStaticClass.kt
@@ -1 +1,6 @@
-class S { class object { open class Inner { } } }
\ No newline at end of file
+class S {
+class object {
+open class Inner {
+}
+}
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/internalClass.kt b/testData/ast/class/class/internalClass.kt
index 503cbe46e7f..23873d0aaa3 100644
--- a/testData/ast/class/class/internalClass.kt
+++ b/testData/ast/class/class/internalClass.kt
@@ -1 +1,2 @@
-open class Test { }
\ No newline at end of file
+open class Test {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/oneStaticFieldOneNonStatic.kt b/testData/ast/class/class/oneStaticFieldOneNonStatic.kt
index 37e1a2c5efa..d2b11e44c60 100644
--- a/testData/ast/class/class/oneStaticFieldOneNonStatic.kt
+++ b/testData/ast/class/class/oneStaticFieldOneNonStatic.kt
@@ -1 +1,8 @@
-class S { class object { var myI : Int = 10 } fun sB() : Boolean { return true } }
\ No newline at end of file
+class S {
+class object {
+var myI : Int = 10
+}
+fun sB() : Boolean {
+return true
+}
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/oneStaticMethod.kt b/testData/ast/class/class/oneStaticMethod.kt
index 0b95364abcf..1e39f93f167 100644
--- a/testData/ast/class/class/oneStaticMethod.kt
+++ b/testData/ast/class/class/oneStaticMethod.kt
@@ -1 +1,7 @@
-class S { class object { fun staticF() : Boolean { return true } } }
\ No newline at end of file
+class S {
+class object {
+fun staticF() : Boolean {
+return true
+}
+}
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/oneStaticMethodOneNonStatic.kt b/testData/ast/class/class/oneStaticMethodOneNonStatic.kt
index ba3e67dd26e..dc7a84e71e4 100644
--- a/testData/ast/class/class/oneStaticMethodOneNonStatic.kt
+++ b/testData/ast/class/class/oneStaticMethodOneNonStatic.kt
@@ -1 +1,10 @@
-class S { class object { fun sI() : Int { return 1 } } fun sB() : Boolean { return true } }
\ No newline at end of file
+class S {
+class object {
+fun sI() : Int {
+return 1
+}
+}
+fun sB() : Boolean {
+return true
+}
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/pivateClass.kt b/testData/ast/class/class/pivateClass.kt
index 8f0cfde9556..8085e2675d2 100644
--- a/testData/ast/class/class/pivateClass.kt
+++ b/testData/ast/class/class/pivateClass.kt
@@ -1 +1,2 @@
-private open class Test { }
\ No newline at end of file
+private open class Test {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/protectedClass.kt b/testData/ast/class/class/protectedClass.kt
index 2f626ef896b..60bd6ecdb0c 100644
--- a/testData/ast/class/class/protectedClass.kt
+++ b/testData/ast/class/class/protectedClass.kt
@@ -1 +1,2 @@
-protected open class Test { }
\ No newline at end of file
+protected open class Test {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/publicClass.kt b/testData/ast/class/class/publicClass.kt
index ec3ccb82f12..44aae358376 100644
--- a/testData/ast/class/class/publicClass.kt
+++ b/testData/ast/class/class/publicClass.kt
@@ -1 +1,2 @@
-public open class Test { }
\ No newline at end of file
+public open class Test {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/simpleInheritance.kt b/testData/ast/class/class/simpleInheritance.kt
index 2aee0acad51..9fe01fc7381 100644
--- a/testData/ast/class/class/simpleInheritance.kt
+++ b/testData/ast/class/class/simpleInheritance.kt
@@ -1 +1,2 @@
-class A : Base { }
\ No newline at end of file
+class A : Base {
+}
\ No newline at end of file
diff --git a/testData/ast/class/class/twoStaticMethod.kt b/testData/ast/class/class/twoStaticMethod.kt
index 034258422aa..4b8bfbbab24 100644
--- a/testData/ast/class/class/twoStaticMethod.kt
+++ b/testData/ast/class/class/twoStaticMethod.kt
@@ -1 +1,10 @@
-class S { class object { fun sB() : Boolean { return true } fun sI() : Int { return 1 } } }
\ No newline at end of file
+class S {
+class object {
+fun sB() : Boolean {
+return true
+}
+fun sI() : Int {
+return 1
+}
+}
+}
\ No newline at end of file
diff --git a/testData/ast/enum/class/emptyEnum.kt b/testData/ast/enum/class/emptyEnum.kt
index ee5f5b8e52b..1af4d906515 100644
--- a/testData/ast/enum/class/emptyEnum.kt
+++ b/testData/ast/enum/class/emptyEnum.kt
@@ -1 +1,2 @@
-enum A { }
\ No newline at end of file
+enum A {
+}
\ No newline at end of file
diff --git a/testData/ast/enum/class/enumImplementsOneInterface.kt b/testData/ast/enum/class/enumImplementsOneInterface.kt
index 9aaec583855..057767b736e 100644
--- a/testData/ast/enum/class/enumImplementsOneInterface.kt
+++ b/testData/ast/enum/class/enumImplementsOneInterface.kt
@@ -1 +1,2 @@
-enum A : I { }
\ No newline at end of file
+enum A : I {
+}
\ No newline at end of file
diff --git a/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt b/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
index 4db3cfa0033..82b4ca0a510 100644
--- a/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
+++ b/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
@@ -1 +1,2 @@
-enum A : I0, I1, I2 { }
\ No newline at end of file
+enum A : I0, I1, I2 {
+}
\ No newline at end of file
diff --git a/testData/ast/enum/class_mult/enumWithNameField.jav b/testData/ast/enum/class/enumWithNameField.jav
similarity index 100%
rename from testData/ast/enum/class_mult/enumWithNameField.jav
rename to testData/ast/enum/class/enumWithNameField.jav
diff --git a/testData/ast/enum/class_mult/enumWithNameField.kt b/testData/ast/enum/class/enumWithNameField.kt
similarity index 100%
rename from testData/ast/enum/class_mult/enumWithNameField.kt
rename to testData/ast/enum/class/enumWithNameField.kt
diff --git a/testData/ast/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav b/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav
similarity index 100%
rename from testData/ast/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav
rename to testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav
diff --git a/testData/ast/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt b/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt
similarity index 100%
rename from testData/ast/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt
rename to testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt
diff --git a/testData/ast/enum/class/internalEnum.kt b/testData/ast/enum/class/internalEnum.kt
index a677a0e3d81..9a04f7dee8d 100644
--- a/testData/ast/enum/class/internalEnum.kt
+++ b/testData/ast/enum/class/internalEnum.kt
@@ -1 +1,2 @@
-enum Test { }
\ No newline at end of file
+enum Test {
+}
\ No newline at end of file
diff --git a/testData/ast/enum/class_mult/overrideToString.jav b/testData/ast/enum/class/overrideToString.jav
similarity index 100%
rename from testData/ast/enum/class_mult/overrideToString.jav
rename to testData/ast/enum/class/overrideToString.jav
diff --git a/testData/ast/enum/class_mult/overrideToString.kt b/testData/ast/enum/class/overrideToString.kt
similarity index 100%
rename from testData/ast/enum/class_mult/overrideToString.kt
rename to testData/ast/enum/class/overrideToString.kt
diff --git a/testData/ast/enum/class/privateEnum.kt b/testData/ast/enum/class/privateEnum.kt
index 91956cea0d2..6d712e6d618 100644
--- a/testData/ast/enum/class/privateEnum.kt
+++ b/testData/ast/enum/class/privateEnum.kt
@@ -1 +1,2 @@
-private enum Test { }
\ No newline at end of file
+private enum Test {
+}
\ No newline at end of file
diff --git a/testData/ast/enum/class/protectedEnum.kt b/testData/ast/enum/class/protectedEnum.kt
index 00aaa1306e8..cee5a49cba3 100644
--- a/testData/ast/enum/class/protectedEnum.kt
+++ b/testData/ast/enum/class/protectedEnum.kt
@@ -1 +1,2 @@
-protected enum Test { }
\ No newline at end of file
+protected enum Test {
+}
\ No newline at end of file
diff --git a/testData/ast/enum/class/publicEnum.kt b/testData/ast/enum/class/publicEnum.kt
index 86f25500c54..1f30de10d07 100644
--- a/testData/ast/enum/class/publicEnum.kt
+++ b/testData/ast/enum/class/publicEnum.kt
@@ -1 +1,2 @@
-public enum Test { }
\ No newline at end of file
+public enum Test {
+}
\ No newline at end of file
diff --git a/testData/ast/enum/class_mult/runnableImplementation.jav b/testData/ast/enum/class/runnableImplementation.jav
similarity index 100%
rename from testData/ast/enum/class_mult/runnableImplementation.jav
rename to testData/ast/enum/class/runnableImplementation.jav
diff --git a/testData/ast/enum/class_mult/runnableImplementation.kt b/testData/ast/enum/class/runnableImplementation.kt
similarity index 100%
rename from testData/ast/enum/class_mult/runnableImplementation.kt
rename to testData/ast/enum/class/runnableImplementation.kt
diff --git a/testData/ast/enum/class_mult/typeSafeEnum.jav b/testData/ast/enum/class/typeSafeEnum.jav
similarity index 100%
rename from testData/ast/enum/class_mult/typeSafeEnum.jav
rename to testData/ast/enum/class/typeSafeEnum.jav
diff --git a/testData/ast/enum/class_mult/typeSafeEnum.kt b/testData/ast/enum/class/typeSafeEnum.kt
similarity index 100%
rename from testData/ast/enum/class_mult/typeSafeEnum.kt
rename to testData/ast/enum/class/typeSafeEnum.kt
diff --git a/testData/ast/trait/class/emptyInterface.kt b/testData/ast/trait/class/emptyInterface.kt
index a2cce28acad..670cabdb241 100644
--- a/testData/ast/trait/class/emptyInterface.kt
+++ b/testData/ast/trait/class/emptyInterface.kt
@@ -1 +1,2 @@
-trait A { }
\ No newline at end of file
+trait A {
+}
\ No newline at end of file
diff --git a/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt
index 354dd60f348..3bbc299803d 100644
--- a/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ b/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -1 +1,2 @@
-trait A : I0, I1, I2 { }
\ No newline at end of file
+trait A : I0, I1, I2 {
+}
\ No newline at end of file
diff --git a/testData/ast/trait/class/extendsOneInterface.kt b/testData/ast/trait/class/extendsOneInterface.kt
index 1d64da28e8d..a5d59a56576 100644
--- a/testData/ast/trait/class/extendsOneInterface.kt
+++ b/testData/ast/trait/class/extendsOneInterface.kt
@@ -1 +1,2 @@
-trait A : I { }
\ No newline at end of file
+trait A : I {
+}
\ No newline at end of file
diff --git a/testData/ast/trait/class_mult/interfaceWithFields.jav b/testData/ast/trait/class/interfaceWithFields.jav
similarity index 100%
rename from testData/ast/trait/class_mult/interfaceWithFields.jav
rename to testData/ast/trait/class/interfaceWithFields.jav
diff --git a/testData/ast/trait/class_mult/interfaceWithFields.kt b/testData/ast/trait/class/interfaceWithFields.kt
similarity index 100%
rename from testData/ast/trait/class_mult/interfaceWithFields.kt
rename to testData/ast/trait/class/interfaceWithFields.kt
diff --git a/testData/ast/trait/class_mult/interfaceWithMethodDeclaration.jav b/testData/ast/trait/class/interfaceWithMethodDeclaration.jav
similarity index 100%
rename from testData/ast/trait/class_mult/interfaceWithMethodDeclaration.jav
rename to testData/ast/trait/class/interfaceWithMethodDeclaration.jav
diff --git a/testData/ast/trait/class_mult/interfaceWithMethodDeclaration.kt b/testData/ast/trait/class/interfaceWithMethodDeclaration.kt
similarity index 100%
rename from testData/ast/trait/class_mult/interfaceWithMethodDeclaration.kt
rename to testData/ast/trait/class/interfaceWithMethodDeclaration.kt
diff --git a/testData/ast/trait/class_mult/interfaceWithStaticFields.jav b/testData/ast/trait/class/interfaceWithStaticFields.jav
similarity index 100%
rename from testData/ast/trait/class_mult/interfaceWithStaticFields.jav
rename to testData/ast/trait/class/interfaceWithStaticFields.jav
diff --git a/testData/ast/trait/class_mult/interfaceWithStaticFields.kt b/testData/ast/trait/class/interfaceWithStaticFields.kt
similarity index 100%
rename from testData/ast/trait/class_mult/interfaceWithStaticFields.kt
rename to testData/ast/trait/class/interfaceWithStaticFields.kt
diff --git a/testData/ast/trait/class/internalInterface.kt b/testData/ast/trait/class/internalInterface.kt
index 1a34b23ead0..802809a5724 100644
--- a/testData/ast/trait/class/internalInterface.kt
+++ b/testData/ast/trait/class/internalInterface.kt
@@ -1 +1,2 @@
-trait Test { }
\ No newline at end of file
+trait Test {
+}
\ No newline at end of file
diff --git a/testData/ast/trait/class/privateInterface.kt b/testData/ast/trait/class/privateInterface.kt
index 40dd81f4759..72942402d0b 100644
--- a/testData/ast/trait/class/privateInterface.kt
+++ b/testData/ast/trait/class/privateInterface.kt
@@ -1 +1,2 @@
-private trait Test { }
\ No newline at end of file
+private trait Test {
+}
\ No newline at end of file
diff --git a/testData/ast/trait/class/protectedInterface.kt b/testData/ast/trait/class/protectedInterface.kt
index 16e306a9859..359d3b99929 100644
--- a/testData/ast/trait/class/protectedInterface.kt
+++ b/testData/ast/trait/class/protectedInterface.kt
@@ -1 +1,2 @@
-protected trait Test { }
\ No newline at end of file
+protected trait Test {
+}
\ No newline at end of file
diff --git a/testData/ast/trait/class/publicInterface.kt b/testData/ast/trait/class/publicInterface.kt
index 3c2f3d72209..14565fbd6b3 100644
--- a/testData/ast/trait/class/publicInterface.kt
+++ b/testData/ast/trait/class/publicInterface.kt
@@ -1 +1,2 @@
-public trait Test { }
\ No newline at end of file
+public trait Test {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt
index 4177d8f1720..d85353e99f4 100644
--- a/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ b/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt
@@ -1 +1,2 @@
-class CC<T : INode?, K : Node?> : A where T : Comparable<in T?>?, K : Collection<in K?>? { }
\ No newline at end of file
+class CC<T : INode?, K : Node?> : A where T : Comparable<in T?>?, K : Collection<in K?>? {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt b/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt
index 16234cc8e44..ef570ae9618 100644
--- a/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt
+++ b/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt
@@ -1 +1,2 @@
-class C<T : INode?> where T : Comparable<in T?>? { }
\ No newline at end of file
+class C<T : INode?> where T : Comparable<in T?>? {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt b/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt
index a22d76df018..7ac90335e6e 100644
--- a/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt
+++ b/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt
@@ -1 +1,2 @@
-class C<T : INode?> : A where T : Comparable<in T?>? { }
\ No newline at end of file
+class C<T : INode?> : A where T : Comparable<in T?>? {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt b/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt
index c915d092f82..077c6618b24 100644
--- a/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt
+++ b/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt
@@ -1 +1,2 @@
-trait CommandHandler<T : Command?> { }
\ No newline at end of file
+trait CommandHandler<T : Command?> {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt b/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt
index 9b684ed9022..4c3fd7537b6 100644
--- a/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt
+++ b/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt
@@ -1 +1,2 @@
-trait CommandHandler<T : INode?, String> { }
\ No newline at end of file
+trait CommandHandler<T : INode?, String> {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/class/genericClass.kt b/testData/ast/typeParameters/class/genericClass.kt
index eba6f27b2bf..c2be9da34e3 100644
--- a/testData/ast/typeParameters/class/genericClass.kt
+++ b/testData/ast/typeParameters/class/genericClass.kt
@@ -1 +1,2 @@
-class Comparable<T> { }
\ No newline at end of file
+class Comparable<T> {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
index 27a4ec88adc..f73bbabea8b 100644
--- a/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ b/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
@@ -1 +1,2 @@
-trait I<T : INode?, K : Node?> : II where T : Comparable<in T?>?, K : Collection<in K?>? { }
\ No newline at end of file
+trait I<T : INode?, K : Node?> : II where T : Comparable<in T?>?, K : Collection<in K?>? {
+}
\ No newline at end of file