diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy
index 141552319bb4..f88469889c69 100644
--- a/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy
+++ b/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy
@@ -343,14 +343,14 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase {
       mySettings.extractedMethodsSettings.depthFirstOrdering = false
       mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.INVOCATION_ORDER
   } }
-  
-  public final void testEmitTLCommentsRelatedMethodsBreadthInvocation() throws Exception {
-    doTest('RearrangementTest13', 'RearrangementResult13BITLC') {
+
+  private void doTestEmitComments(args) {
+    doTest(args.initial?: 'RearrangementTest13', args.expected) {
       mySettings.extractedMethodsSettings.moveExtractedMethods = true
-      mySettings.extractedMethodsSettings.depthFirstOrdering = false
-      mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.INVOCATION_ORDER
-      mySettings.extractedMethodsSettings.commentType = RelatedMethodsSettings.COMMENT_TYPE_TOP_LEVEL
-      
+      mySettings.extractedMethodsSettings.depthFirstOrdering = args.depthFirst
+      mySettings.extractedMethodsSettings.ordering = args.orderType
+      mySettings.extractedMethodsSettings.commentType = args.commentType
+
       def precedingCommentRule = new CommentRule()
       precedingCommentRule.commentText = '''\
 // Preceding comment: TL=%TL%
@@ -367,256 +367,108 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase {
 // Level %LV%'''
       mySettings.extractedMethodsSettings.trailingComment = trailingCommentRule
   } }
+  
+  public final void testEmitTLCommentsRelatedMethodsBreadthInvocation() throws Exception {
+    doTestEmitComments(
+            expected: 'RearrangementResult13BITLC',
+            depthFirst: false,
+            orderType: RelatedMethodsSettings.INVOCATION_ORDER,
+            commentType: RelatedMethodsSettings.COMMENT_TYPE_TOP_LEVEL
+    )
+  }
 
   public final void testEmitEMCommentsRelatedMethodsBreadthInvocation() throws Exception {
-    doTest('RearrangementTest13', 'RearrangementResult13BIEMC') {
-      mySettings.extractedMethodsSettings.moveExtractedMethods = true
-      mySettings.extractedMethodsSettings.depthFirstOrdering = false
-      mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.INVOCATION_ORDER
-      mySettings.extractedMethodsSettings.commentType = RelatedMethodsSettings.COMMENT_TYPE_EACH_METHOD
-
-      def precedingCommentRule = new CommentRule()
-      precedingCommentRule.commentText = '''\
-// Preceding comment: TL=%TL%
-// MN=%MN%
-// AM=%AM%
-// Level %LV%'''
-      mySettings.extractedMethodsSettings.precedingComment = precedingCommentRule
-
-      def trailingCommentRule = new CommentRule()
-      trailingCommentRule.commentText = '''
-// Trailing comment: TL=%TL%
-// MN=%MN%
-// AM=%AM%
-// Level %LV%'''
-      mySettings.extractedMethodsSettings.trailingComment = trailingCommentRule
-  } }
+    doTestEmitComments(
+            expected: 'RearrangementResult13BIEMC',
+            depthFirst: false,
+            orderType: RelatedMethodsSettings.INVOCATION_ORDER,
+            commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_METHOD
+    )
+  }
 
   public final void testEmitELCommentsRelatedMethodsBreadthInvocation() throws Exception {
-    doTest('RearrangementTest13', 'RearrangementResult13BIELC') {
+    doTestEmitComments(
+            expected: 'RearrangementResult13BIELC',
+            depthFirst: false,
+            orderType: RelatedMethodsSettings.INVOCATION_ORDER,
+            commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_LEVEL
+    )
+  }
+
+  public final void testEmitNFCommentsRelatedMethodsBreadthInvocation() throws Exception {
+    doTestEmitComments(
+            expected: 'RearrangementResult13BINFC',
+            depthFirst: false,
+            orderType: RelatedMethodsSettings.INVOCATION_ORDER,
+            commentType: RelatedMethodsSettings.COMMENT_TYPE_NEW_FAMILY
+    )
+  }
+
+  public final void testEmitTLCommentsRelatedMethodsDepthInvocation() throws Exception {
+    doTestEmitComments(
+            expected: 'RearrangementResult13DITLC',
+            depthFirst: true,
+            orderType: RelatedMethodsSettings.INVOCATION_ORDER,
+            commentType: RelatedMethodsSettings.COMMENT_TYPE_TOP_LEVEL
+    )
+  }
+
+  public final void testEmitEMCommentsRelatedMethodsDepthInvocation() throws Exception {
+    doTestEmitComments(
+            expected: 'RearrangementResult13DIEMC',
+            depthFirst: true,
+            orderType: RelatedMethodsSettings.INVOCATION_ORDER,
+            commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_METHOD
+    )
+  }
+
+  public final void testEmitELCommentsRelatedMethodsDepthInvocation() throws Exception {
+    doTestEmitComments(
+            expected: 'RearrangementResult13BIELC',
+            depthFirst: false,
+            orderType: RelatedMethodsSettings.INVOCATION_ORDER,
+            commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_LEVEL
+    )
+  }
+
+  public final void testEmitNFCommentsRelatedMethodsDepthInvocation() throws Exception {
+    doTestEmitComments(
+            expected: 'RearrangementResult13DINFC',
+            depthFirst: true,
+            orderType: RelatedMethodsSettings.INVOCATION_ORDER,
+            commentType: RelatedMethodsSettings.COMMENT_TYPE_NEW_FAMILY
+    )
+  }
+  
+  public final void testRelatedMethodsException() throws Exception {
+    doTest('RearrangementTest13', 'RearrangementResult13Ex') {
+      mySettings.extractedMethodsSettings.moveExtractedMethods = true
+      mySettings.extractedMethodsSettings.depthFirstOrdering = true
+      mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.RETAIN_ORIGINAL_ORDER
+      methodRule.create { name('GF') }
+  } }
+
+  public final void testKeepOverloadedMethodsTogether() throws Exception {
+    doTest('RearrangementTest14', 'RearrangementResult14') {
       mySettings.extractedMethodsSettings.moveExtractedMethods = true
       mySettings.extractedMethodsSettings.depthFirstOrdering = false
       mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.INVOCATION_ORDER
-      mySettings.extractedMethodsSettings.commentType = RelatedMethodsSettings.COMMENT_TYPE_EACH_LEVEL
-
-      def precedingCommentRule = new CommentRule()
-      precedingCommentRule.commentText = '''\
-// Preceding comment: TL=%TL%
-// MN=%MN%
-// AM=%AM%
-// Level %LV%'''
-      mySettings.extractedMethodsSettings.precedingComment = precedingCommentRule
-
-      def trailingCommentRule = new CommentRule()
-      trailingCommentRule.commentText = '''
-// Trailing comment: TL=%TL%
-// MN=%MN%
-// AM=%AM%
-// Level %LV%'''
-      mySettings.extractedMethodsSettings.trailingComment = trailingCommentRule
+      mySettings.keepOverloadedMethodsTogether = true
   } }
 
-//  public final void testEmitNFCommentsRelatedMethodsBreadthInvocation() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest13.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rs.getExtractedMethodsSettings().setMoveExtractedMethods(true);
-//    rs.getExtractedMethodsSettings().setDepthFirstOrdering(false);
-//    rs.getExtractedMethodsSettings().setOrdering(RelatedMethodsSettings.INVOCATION_ORDER);
-//    rs.getExtractedMethodsSettings().setCommentType(RelatedMethodsSettings.COMMENT_TYPE_NEW_FAMILY);
-//    CommentRule c = new CommentRule();
-//    c.setCommentText("// Preceding comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setPrecedingComment(c);
-//    c = new CommentRule();
-//    c.setCommentText("// Trailing comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setTrailingComment(c);
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementResult13BINFC.java");
-//  }
-//
-//  public final void testEmitTLCommentsRelatedMethodsDepthInvocation() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest13.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rs.getExtractedMethodsSettings().setMoveExtractedMethods(true);
-//    rs.getExtractedMethodsSettings().setDepthFirstOrdering(true);
-//    rs.getExtractedMethodsSettings().setOrdering(RelatedMethodsSettings.INVOCATION_ORDER);
-//    rs.getExtractedMethodsSettings().setCommentType(RelatedMethodsSettings.COMMENT_TYPE_TOP_LEVEL);
-//    CommentRule c = new CommentRule();
-//    c.setCommentText("// Preceding comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setPrecedingComment(c);
-//    c = new CommentRule();
-//    c.setCommentText("// Trailing comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setTrailingComment(c);
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementResult13DITLC.java");
-//  }
-//
-//  public final void testEmitEMCommentsRelatedMethodsDepthInvocation() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest13.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rs.getExtractedMethodsSettings().setMoveExtractedMethods(true);
-//    rs.getExtractedMethodsSettings().setDepthFirstOrdering(true);
-//    rs.getExtractedMethodsSettings().setOrdering(RelatedMethodsSettings.INVOCATION_ORDER);
-//    rs.getExtractedMethodsSettings().setCommentType(RelatedMethodsSettings.COMMENT_TYPE_EACH_METHOD);
-//    CommentRule c = new CommentRule();
-//    c.setCommentText("// Preceding comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setPrecedingComment(c);
-//    c = new CommentRule();
-//    c.setCommentText("// Trailing comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setTrailingComment(c);
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementResult13DIEMC.java");
-//  }
-//
-//  public final void testEmitELCommentsRelatedMethodsDepthInvocation() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest13.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rs.getExtractedMethodsSettings().setMoveExtractedMethods(true);
-//    rs.getExtractedMethodsSettings().setDepthFirstOrdering(true);
-//    rs.getExtractedMethodsSettings().setOrdering(RelatedMethodsSettings.INVOCATION_ORDER);
-//    rs.getExtractedMethodsSettings().setCommentType(RelatedMethodsSettings.COMMENT_TYPE_EACH_LEVEL);
-//    CommentRule c = new CommentRule();
-//    c.setCommentText("// Preceding comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setPrecedingComment(c);
-//    c = new CommentRule();
-//    c.setCommentText("// Trailing comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setTrailingComment(c);
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementResult13DIELC.java");
-//  }
-//
-//  public final void testEmitNFCommentsRelatedMethodsDepthInvocation() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest13.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rs.getExtractedMethodsSettings().setMoveExtractedMethods(true);
-//    rs.getExtractedMethodsSettings().setDepthFirstOrdering(true);
-//    rs.getExtractedMethodsSettings().setOrdering(RelatedMethodsSettings.INVOCATION_ORDER);
-//    rs.getExtractedMethodsSettings().setCommentType(RelatedMethodsSettings.COMMENT_TYPE_NEW_FAMILY);
-//    CommentRule c = new CommentRule();
-//    c.setCommentText("// Preceding comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setPrecedingComment(c);
-//    c = new CommentRule();
-//    c.setCommentText("// Trailing comment: TL=%TL%\n" +
-//                     "// MN=%MN%\n" +
-//                     "// AM=%AM%\n" +
-//                     "// Level %LV%");
-//    rs.getExtractedMethodsSettings().setTrailingComment(c);
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementResult13DINFC.java");
-//  }
-//
-//  public final void testRelatedMethodsException() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest13.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rs.getExtractedMethodsSettings().setMoveExtractedMethods(true);
-//    rs.getExtractedMethodsSettings().setDepthFirstOrdering(false);
-//    rs.getExtractedMethodsSettings().setOrdering(RelatedMethodsSettings.RETAIN_ORIGINAL_ORDER);
-//    MethodAttributes ma = new MethodAttributes();
-//    ma.setNoExtractedMethods(true);
-//    ma.getNameAttr().setMatch(true);
-//    ma.getNameAttr().setExpression("GF");
-//    rs.addItem(ma, 0);
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementResult13Ex.java");
-//  }
-//
-//  public final void testKeepOverloadedMethodsTogether() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest14.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rs.getExtractedMethodsSettings().setMoveExtractedMethods(true);
-//    rs.getExtractedMethodsSettings().setDepthFirstOrdering(false);
-//    rs.getExtractedMethodsSettings().setOrdering(RelatedMethodsSettings.INVOCATION_ORDER);
-//    rs.setKeepOverloadedMethodsTogether(true);
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementResult14.java");
-//  }
-//
-//  public final void testOverrides() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest15.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//  }
-//
-//  public final void testImplements() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest16.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//  }
-//
-//  public final void testXML() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest17.xml");
-//    // we should not do anything to XML files.
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementTest17.xml");
-//  }
-//
-//  public final void testKeepGSTogether() throws Exception {
-//    configureByFile("/com/wrq/rearranger/RearrangementTest18.java");
-//    final PsiFile file = getFile();
-//    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
-//    final RearrangerActionHandler rah = new RearrangerActionHandler();
-//    rs.setKeepGettersSettersTogether(true);
-//    rs.getExtractedMethodsSettings().setOrdering(RelatedMethodsSettings.ALPHABETICAL_ORDER);
-//    FieldAttributes fa = new FieldAttributes();
-//    rs.addItem(fa, 0);
-//    MethodAttributes ma = new MethodAttributes();
-//    ma.setConstructorMethodType(true);
-//    rs.addItem(ma, 1);
-//    ma = new MethodAttributes();
-//    ma.setGetterSetterMethodType(true);
-//    ma.getSortAttr().setByName(true);
-//    rs.addItem(ma, 2);
-//    rah.rearrangeDocument(getProject(), file, rs, doc);
-//    super.checkResultByFile("/com/wrq/rearranger/RearrangementResult18.java");
-//  }
-//
+  public final void testXML() throws Exception { doTest('RearrangementTest17', 'RearrangementTest17', 'xml') }
+
+  public final void testKeepGSTogether() throws Exception {
+    doTest('RearrangementTest18', 'RearrangementResult18') {
+      mySettings.keepGettersSettersTogether = true
+      mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.ALPHABETICAL_ORDER
+      fieldRule.create {}
+      methodRule.create { target( MethodType.CONSTRUCTOR ) }
+      methodRule.create {
+        target( MethodType.GETTER_OR_SETTER )
+        sort( SortType.BY_NAME )
+  } } }
+
 //  public final void testKeepGSWithProperty() throws Exception {
 //    configureByFile("/com/wrq/rearranger/RearrangementTest18.java");
 //    final PsiFile file = getFile();
@@ -1955,13 +1807,20 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase {
 //  }
 
   private void doTest(@NotNull String srcFileName, @Nullable String expectedResultFileName, @Nullable Closure adjustment = null) {
-    myFixture.configureByFile("${srcFileName}.java")
+    doTest(srcFileName, expectedResultFileName, 'java', adjustment)
+  }
+  
+  
+  private void doTest(@NotNull String srcFileName, @Nullable String expectedResultFileName, @Nullable String extension,
+                      @Nullable Closure adjustment = null)
+  {
+    myFixture.configureByFile("${srcFileName}.$extension")
     if (adjustment) {
       adjustment.call()
     }
     ApplicationManager.application.runWriteAction {
       new RearrangerActionHandler().rearrangeDocument(myFixture.project, myFixture.file, mySettings, myFixture.editor.document);
     }
-    myFixture.checkResultByFile("${expectedResultFileName}.java")
+    myFixture.checkResultByFile("${expectedResultFileName}.$extension")
   }
 }
\ No newline at end of file
diff --git a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13BIELC.java b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13BIELC.java
index 3bc2971c81c4..d27a917e800e 100644
--- a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13BIELC.java
+++ b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13BIELC.java
@@ -37,17 +37,14 @@ public class RearrangerTest13 {
 
   void S2B() {
   }
-
 // Trailing comment: TL=GF
 // MN=F2
 // AM=GF().[F1(),F2()]
 // Level 3
-
 // Trailing comment: TL=GF
 // MN=GF
 // AM=GF()
 // Level 2
-
 // Trailing comment: TL=GF
 // MN=GF
 // AM=
diff --git a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13BIEMC.java b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13BIEMC.java
index 0ec967d9fcae..808b583c7f12 100644
--- a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13BIEMC.java
+++ b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13BIEMC.java
@@ -7,7 +7,6 @@ public class RearrangerTest13 {
     F1();
     F2();
   }
-
 // Trailing comment: TL=GF
 // MN=GF
 // AM=
@@ -21,7 +20,6 @@ public class RearrangerTest13 {
     S1B();
     S1A();
   }
-
 // Trailing comment: TL=GF
 // MN=F1
 // AM=GF()
@@ -35,7 +33,6 @@ public class RearrangerTest13 {
     S2A();
     S2B();
   }
-
 // Trailing comment: TL=GF
 // MN=F2
 // AM=GF()
@@ -47,7 +44,6 @@ public class RearrangerTest13 {
 
   void S1B() {
   }
-
 // Trailing comment: TL=GF
 // MN=S1B
 // AM=GF().[F1(),F2()]
@@ -59,7 +55,6 @@ public class RearrangerTest13 {
 
   void S1A() {
   }
-
 // Trailing comment: TL=GF
 // MN=S1A
 // AM=GF().[F1(),F2()]
@@ -71,7 +66,6 @@ public class RearrangerTest13 {
 
   void S2A() {
   }
-
 // Trailing comment: TL=GF
 // MN=S2A
 // AM=GF().[F1(),F2()]
@@ -83,7 +77,6 @@ public class RearrangerTest13 {
 
   void S2B() {
   }
-
 // Trailing comment: TL=GF
 // MN=S2B
 // AM=GF().[F1(),F2()]
diff --git a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DIELC.java b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DIELC.java
index 16cafde0c90f..9c708957c9cc 100644
--- a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DIELC.java
+++ b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DIELC.java
@@ -1,5 +1,5 @@
 public class RearrangerTest13 {
-  // Preceding comment: TL=GF
+// Preceding comment: TL=GF
 // MN=GF
 // AM=
 // Level 1
@@ -16,16 +16,17 @@ public class RearrangerTest13 {
     S1B();
     S1A();
   }
-
-  // Preceding comment: TL=GF
+// Preceding comment: TL=GF
 // MN=F1
 // AM=GF().F1()
 // Level 3
+
   void S1B() {
   }
 
   void S1A() {
   }
+
 // Trailing comment: TL=GF
 // MN=F1
 // AM=GF().F1()
@@ -35,24 +36,27 @@ public class RearrangerTest13 {
     S2A();
     S2B();
   }
-
-  // Preceding comment: TL=GF
+// Preceding comment: TL=GF
 // MN=F2
 // AM=GF().F2()
 // Level 3
+
   void S2A() {
   }
 
   void S2B() {
   }
+
 // Trailing comment: TL=GF
 // MN=F2
 // AM=GF().F2()
 // Level 3
+
 // Trailing comment: TL=GF
 // MN=GF
 // AM=GF()
 // Level 2
+
 // Trailing comment: TL=GF
 // MN=GF
 // AM=
diff --git a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DIEMC.java b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DIEMC.java
index 6f90b4913aa3..43d8480418f6 100644
--- a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DIEMC.java
+++ b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DIEMC.java
@@ -1,5 +1,5 @@
 public class RearrangerTest13 {
-  // Preceding comment: TL=GF
+// Preceding comment: TL=GF
 // MN=GF
 // AM=
 // Level 1
@@ -20,8 +20,7 @@ public class RearrangerTest13 {
     S1B();
     S1A();
   }
-
-  // Trailing comment: TL=GF
+// Trailing comment: TL=GF
 // MN=F1
 // AM=GF()
 // Level 2
@@ -29,10 +28,10 @@ public class RearrangerTest13 {
 // MN=S1B
 // AM=GF().F1()
 // Level 3
+
   void S1B() {
   }
-
-  // Trailing comment: TL=GF
+// Trailing comment: TL=GF
 // MN=S1B
 // AM=GF().F1()
 // Level 3
@@ -40,6 +39,7 @@ public class RearrangerTest13 {
 // MN=S1A
 // AM=GF().F1()
 // Level 3
+
   void S1A() {
   }
 // Trailing comment: TL=GF
@@ -55,8 +55,7 @@ public class RearrangerTest13 {
     S2A();
     S2B();
   }
-
-  // Trailing comment: TL=GF
+// Trailing comment: TL=GF
 // MN=F2
 // AM=GF()
 // Level 2
@@ -64,10 +63,10 @@ public class RearrangerTest13 {
 // MN=S2A
 // AM=GF().F2()
 // Level 3
+
   void S2A() {
   }
-
-  // Trailing comment: TL=GF
+// Trailing comment: TL=GF
 // MN=S2A
 // AM=GF().F2()
 // Level 3
@@ -75,6 +74,7 @@ public class RearrangerTest13 {
 // MN=S2B
 // AM=GF().F2()
 // Level 3
+
   void S2B() {
   }
 // Trailing comment: TL=GF
diff --git a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DITLC.java b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DITLC.java
index b238fa8d540c..55d186e1aa1a 100644
--- a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DITLC.java
+++ b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementResult13DITLC.java
@@ -1,5 +1,5 @@
 public class RearrangerTest13 {
-  // Preceding comment: TL=GF
+// Preceding comment: TL=GF
 // MN=GF
 // AM=
 // Level 1
diff --git a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementTest14.java b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementTest14.java
index a4e9e2575e89..400b3a756241 100644
--- a/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementTest14.java
+++ b/plugins/rearranger/test/testData/com/wrq/rearranger/RearrangementTest14.java
@@ -1,4 +1,5 @@
 public class RearrangementTest14 {
+
   int doIt(int x) {
     return x + 1;
   }