diff --git a/js/test/generated/beautify-css-tests.js b/js/test/generated/beautify-css-tests.js
index 7b6d95611..7d3139f65 100644
--- a/js/test/generated/beautify-css-tests.js
+++ b/js/test/generated/beautify-css-tests.js
@@ -123,7 +123,15 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         opts.end_with_newline = true;
         test_fragment('', '\n');
         test_fragment('   .tabs{}', '   .tabs {}\n');
-        test_fragment('   \n\n.tabs{}\n\n\n\n', '   .tabs {}\n');
+        test_fragment(
+            '   \n' +
+            '\n' +
+            '.tabs{}\n' +
+            '\n' +
+            '\n' +
+            '\n',
+            //  -- output --
+            '   .tabs {}\n');
         test_fragment('\n');
 
         // End With Newline - (eof = "")
@@ -131,7 +139,15 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         opts.end_with_newline = false;
         test_fragment('');
         test_fragment('   .tabs{}', '   .tabs {}');
-        test_fragment('   \n\n.tabs{}\n\n\n\n', '   .tabs {}');
+        test_fragment(
+            '   \n' +
+            '\n' +
+            '.tabs{}\n' +
+            '\n' +
+            '\n' +
+            '\n',
+            //  -- output --
+            '   .tabs {}');
         test_fragment('\n', '');
 
 
@@ -141,13 +157,30 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t('.tabs{}', '.tabs {}');
         t('.tabs { }', '.tabs {}');
         t('.tabs    {    }', '.tabs {}');
-        t('.tabs    \n{\n    \n  }', '.tabs {}');
+        t(
+            '.tabs    \n' +
+            '{\n' +
+            '    \n' +
+            '  }',
+            //  -- output --
+            '.tabs {}');
 
 
         //============================================================
         // 
         reset_options();
-        t('#cboxOverlay {\n\tbackground: url(images/overlay.png) repeat 0 0;\n\topacity: 0.9;\n\tfilter: alpha(opacity = 90);\n}', '#cboxOverlay {\n\tbackground: url(images/overlay.png) repeat 0 0;\n\topacity: 0.9;\n\tfilter: alpha(opacity=90);\n}');
+        t(
+            '#cboxOverlay {\n' +
+            '\tbackground: url(images/overlay.png) repeat 0 0;\n' +
+            '\topacity: 0.9;\n' +
+            '\tfilter: alpha(opacity = 90);\n' +
+            '}',
+            //  -- output --
+            '#cboxOverlay {\n' +
+            '\tbackground: url(images/overlay.png) repeat 0 0;\n' +
+            '\topacity: 0.9;\n' +
+            '\tfilter: alpha(opacity=90);\n' +
+            '}');
 
 
         //============================================================
@@ -199,21 +232,25 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t('a + b > c{}', 'a + b > c {}');
         t(
             'a > b{width: calc(100% + 45px);}',
+            //  -- output --
             'a > b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a ~ b{width: calc(100% + 45px);}',
+            //  -- output --
             'a ~ b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a + b{width: calc(100% + 45px);}',
+            //  -- output --
             'a + b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a + b > c{width: calc(100% + 45px);}',
+            //  -- output --
             'a + b > c {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
@@ -231,21 +268,25 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t('a + b > c{}', 'a+b>c {}');
         t(
             'a > b{width: calc(100% + 45px);}',
+            //  -- output --
             'a>b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a ~ b{width: calc(100% + 45px);}',
+            //  -- output --
             'a~b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a + b{width: calc(100% + 45px);}',
+            //  -- output --
             'a+b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a + b > c{width: calc(100% + 45px);}',
+            //  -- output --
             'a+b>c {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
@@ -263,21 +304,25 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t('a + b > c{}', 'a + b > c {}');
         t(
             'a > b{width: calc(100% + 45px);}',
+            //  -- output --
             'a > b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a ~ b{width: calc(100% + 45px);}',
+            //  -- output --
             'a ~ b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a + b{width: calc(100% + 45px);}',
+            //  -- output --
             'a + b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
         t(
             'a + b > c{width: calc(100% + 45px);}',
+            //  -- output --
             'a + b > c {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}');
@@ -288,41 +333,153 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         reset_options();
         opts.selector_separator_newline = false;
         opts.selector_separator = " ";
-        t('#bla, #foo{color:green}', '#bla, #foo {\n\tcolor: green\n}');
-        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}');
-        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab, .bat {}\n}');
-        t('#bla, #foo{color:black}', '#bla, #foo {\n\tcolor: black\n}');
-        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child, a:first-child {\n\tcolor: red;\n\tdiv:first-child, div:hover {\n\t\tcolor: black;\n\t}\n}');
+        t(
+            '#bla, #foo{color:green}',
+            //  -- output --
+            '#bla, #foo {\n' +
+            '\tcolor: green\n' +
+            '}');
+        t(
+            '@media print {.tab{}}',
+            //  -- output --
+            '@media print {\n' +
+            '\t.tab {}\n' +
+            '}');
+        t(
+            '@media print {.tab,.bat{}}',
+            //  -- output --
+            '@media print {\n' +
+            '\t.tab, .bat {}\n' +
+            '}');
+        t(
+            '#bla, #foo{color:black}',
+            //  -- output --
+            '#bla, #foo {\n' +
+            '\tcolor: black\n' +
+            '}');
+        t(
+            'a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}',
+            //  -- output --
+            'a:first-child, a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child, div:hover {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}');
 
         // Selector Separator - (separator = " ", separator1 = " ")
         reset_options();
         opts.selector_separator_newline = false;
         opts.selector_separator = "  ";
-        t('#bla, #foo{color:green}', '#bla, #foo {\n\tcolor: green\n}');
-        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}');
-        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab, .bat {}\n}');
-        t('#bla, #foo{color:black}', '#bla, #foo {\n\tcolor: black\n}');
-        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child, a:first-child {\n\tcolor: red;\n\tdiv:first-child, div:hover {\n\t\tcolor: black;\n\t}\n}');
+        t(
+            '#bla, #foo{color:green}',
+            //  -- output --
+            '#bla, #foo {\n' +
+            '\tcolor: green\n' +
+            '}');
+        t(
+            '@media print {.tab{}}',
+            //  -- output --
+            '@media print {\n' +
+            '\t.tab {}\n' +
+            '}');
+        t(
+            '@media print {.tab,.bat{}}',
+            //  -- output --
+            '@media print {\n' +
+            '\t.tab, .bat {}\n' +
+            '}');
+        t(
+            '#bla, #foo{color:black}',
+            //  -- output --
+            '#bla, #foo {\n' +
+            '\tcolor: black\n' +
+            '}');
+        t(
+            'a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}',
+            //  -- output --
+            'a:first-child, a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child, div:hover {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}');
 
         // Selector Separator - (separator = "\n", separator1 = "\n\t")
         reset_options();
         opts.selector_separator_newline = true;
         opts.selector_separator = " ";
-        t('#bla, #foo{color:green}', '#bla,\n#foo {\n\tcolor: green\n}');
-        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}');
-        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab,\n\t.bat {}\n}');
-        t('#bla, #foo{color:black}', '#bla,\n#foo {\n\tcolor: black\n}');
-        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child,\na:first-child {\n\tcolor: red;\n\tdiv:first-child,\n\tdiv:hover {\n\t\tcolor: black;\n\t}\n}');
+        t(
+            '#bla, #foo{color:green}',
+            //  -- output --
+            '#bla,\n#foo {\n' +
+            '\tcolor: green\n' +
+            '}');
+        t(
+            '@media print {.tab{}}',
+            //  -- output --
+            '@media print {\n' +
+            '\t.tab {}\n' +
+            '}');
+        t(
+            '@media print {.tab,.bat{}}',
+            //  -- output --
+            '@media print {\n' +
+            '\t.tab,\n\t.bat {}\n' +
+            '}');
+        t(
+            '#bla, #foo{color:black}',
+            //  -- output --
+            '#bla,\n#foo {\n' +
+            '\tcolor: black\n' +
+            '}');
+        t(
+            'a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}',
+            //  -- output --
+            'a:first-child,\na:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child,\n\tdiv:hover {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}');
 
         // Selector Separator - (separator = "\n", separator1 = "\n\t")
         reset_options();
         opts.selector_separator_newline = true;
         opts.selector_separator = "  ";
-        t('#bla, #foo{color:green}', '#bla,\n#foo {\n\tcolor: green\n}');
-        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}');
-        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab,\n\t.bat {}\n}');
-        t('#bla, #foo{color:black}', '#bla,\n#foo {\n\tcolor: black\n}');
-        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child,\na:first-child {\n\tcolor: red;\n\tdiv:first-child,\n\tdiv:hover {\n\t\tcolor: black;\n\t}\n}');
+        t(
+            '#bla, #foo{color:green}',
+            //  -- output --
+            '#bla,\n#foo {\n' +
+            '\tcolor: green\n' +
+            '}');
+        t(
+            '@media print {.tab{}}',
+            //  -- output --
+            '@media print {\n' +
+            '\t.tab {}\n' +
+            '}');
+        t(
+            '@media print {.tab,.bat{}}',
+            //  -- output --
+            '@media print {\n' +
+            '\t.tab,\n\t.bat {}\n' +
+            '}');
+        t(
+            '#bla, #foo{color:black}',
+            //  -- output --
+            '#bla,\n#foo {\n' +
+            '\tcolor: black\n' +
+            '}');
+        t(
+            'a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}',
+            //  -- output --
+            'a:first-child,\na:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child,\n\tdiv:hover {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}');
 
 
         //============================================================
@@ -330,52 +487,378 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         reset_options();
         opts.preserve_newlines = true;
         t('.div {}\n\n.span {}');
-        t('#bla, #foo{\n\tcolor:black;\n\n\tfont-size: 12px;\n}', '#bla,\n#foo {\n\tcolor: black;\n\n\tfont-size: 12px;\n}');
+        t(
+            '#bla, #foo{\n' +
+            '\tcolor:black;\n\n\tfont-size: 12px;\n' +
+            '}',
+            //  -- output --
+            '#bla,\n' +
+            '#foo {\n' +
+            '\tcolor: black;\n\n\tfont-size: 12px;\n' +
+            '}');
 
         // Preserve Newlines - (separator_input = "\n\n", separator_output = "\n")
         reset_options();
         opts.preserve_newlines = false;
         t('.div {}\n\n.span {}', '.div {}\n.span {}');
-        t('#bla, #foo{\n\tcolor:black;\n\n\tfont-size: 12px;\n}', '#bla,\n#foo {\n\tcolor: black;\n\tfont-size: 12px;\n}');
+        t(
+            '#bla, #foo{\n' +
+            '\tcolor:black;\n\n\tfont-size: 12px;\n' +
+            '}',
+            //  -- output --
+            '#bla,\n' +
+            '#foo {\n' +
+            '\tcolor: black;\n\tfont-size: 12px;\n' +
+            '}');
 
 
         //============================================================
         // Preserve Newlines and add tabs
         reset_options();
         opts.preserve_newlines = true;
-        t('.tool-tip {\n\tposition: relative;\n\n\t\t\n\t.tool-tip-content {\n\t\t&>* {\n\t\t\tmargin-top: 0;\n\t\t}\n\t\t\n\n\t\t.mixin-box-shadow(.2rem .2rem .5rem rgba(0, 0, 0, .15));\n\t\tpadding: 1rem;\n\t\tposition: absolute;\n\t\tz-index: 10;\n\t}\n}', '.tool-tip {\n\tposition: relative;\n\n\n\t.tool-tip-content {\n\t\t&>* {\n\t\t\tmargin-top: 0;\n\t\t}\n\n\n\t\t.mixin-box-shadow(.2rem .2rem .5rem rgba(0, 0, 0, .15));\n\t\tpadding: 1rem;\n\t\tposition: absolute;\n\t\tz-index: 10;\n\t}\n}');
+        t(
+            '.tool-tip {\n' +
+            '\tposition: relative;\n' +
+            '\n' +
+            '\t\t\n' +
+            '\t.tool-tip-content {\n' +
+            '\t\t&>* {\n' +
+            '\t\t\tmargin-top: 0;\n' +
+            '\t\t}\n' +
+            '\t\t\n' +
+            '\n' +
+            '\t\t.mixin-box-shadow(.2rem .2rem .5rem rgba(0, 0, 0, .15));\n' +
+            '\t\tpadding: 1rem;\n' +
+            '\t\tposition: absolute;\n' +
+            '\t\tz-index: 10;\n' +
+            '\t}\n' +
+            '}',
+            //  -- output --
+            '.tool-tip {\n' +
+            '\tposition: relative;\n' +
+            '\n' +
+            '\n' +
+            '\t.tool-tip-content {\n' +
+            '\t\t&>* {\n' +
+            '\t\t\tmargin-top: 0;\n' +
+            '\t\t}\n' +
+            '\n\n\t\t.mixin-box-shadow(.2rem .2rem .5rem rgba(0, 0, 0, .15));\n' +
+            '\t\tpadding: 1rem;\n' +
+            '\t\tposition: absolute;\n' +
+            '\t\tz-index: 10;\n' +
+            '\t}\n' +
+            '}');
 
 
         //============================================================
         // Newline Between Rules - (separator = "\n")
         reset_options();
         opts.newline_between_rules = true;
-        t('.div {}\n.span {}', '.div {}\n\n.span {}');
-        t('.div{}\n   \n.span{}', '.div {}\n\n.span {}');
-        t('.div {}    \n  \n.span { } \n', '.div {}\n\n.span {}');
-        t('.div {\n    \n} \n  .span {\n }  ', '.div {}\n\n.span {}');
-        t('.selector1 {\n\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n}\n.div{height:15px;}', '.selector1 {\n\tmargin: 0;\n\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n}\n\n.div {\n\theight: 15px;\n}');
-        t('.tabs{width:10px;//end of line comment\nheight:10px;//another\n}\n.div{height:15px;}', '.tabs {\n\twidth: 10px; //end of line comment\n\theight: 10px; //another\n}\n\n.div {\n\theight: 15px;\n}');
-        t('#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n\n.div {\n\theight: 15px;\n}');
-        t('@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n\n.div {\n\theight: 15px;\n}');
-        t('@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}', '@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}');
-        t('a:first-child{color:red;div:first-child{color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:first-child {\n\t\tcolor: black;\n\t}\n}\n\n.div {\n\theight: 15px;\n}');
-        t('a:first-child{color:red;div:not(.peq){color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:not(.peq) {\n\t\tcolor: black;\n\t}\n}\n\n.div {\n\theight: 15px;\n}');
+        t(
+            '.div {}\n' +
+            '.span {}',
+            //  -- output --
+            '.div {}\n' +
+            '\n.span {}');
+        t(
+            '.div{}\n' +
+            '   \n' +
+            '.span{}',
+            //  -- output --
+            '.div {}\n' +
+            '\n.span {}');
+        t(
+            '.div {}    \n' +
+            '  \n' +
+            '.span { } \n',
+            //  -- output --
+            '.div {}\n' +
+            '\n.span {}');
+        t(
+            '.div {\n' +
+            '    \n' +
+            '} \n' +
+            '  .span {\n' +
+            ' }  ',
+            //  -- output --
+            '.div {}\n' +
+            '\n.span {}');
+        t(
+            '.selector1 {\n' +
+            '\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            '.selector1 {\n' +
+            '\tmargin: 0;\n' +
+            '\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            'height:10px;//another\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '\theight: 10px; //another\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            '#foo {\n' +
+            '\tbackground-image: url(foo@2x.png);\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            '#foo {\n' +
+            '\tbackground-image: url(foo@2x.png);\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t}\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t}\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            '@font-face {\n' +
+            '\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '}\n' +
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo.png);\n' +
+            '\t}\n' +
+            '\t@media screen and (min-device-pixel-ratio: 2) {\n' +
+            '\t\t@font-face {\n' +
+            '\t\t\tfont-family: "Helvetica Neue"\n' +
+            '\t\t}\n' +
+            '\t\t#foo:hover {\n' +
+            '\t\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t\t}\n' +
+            '\t}\n' +
+            '}',
+            //  -- output --
+            '@font-face {\n' +
+            '\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '}\n' +
+            '\n@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo.png);\n' +
+            '\t}\n' +
+            '\t@media screen and (min-device-pixel-ratio: 2) {\n' +
+            '\t\t@font-face {\n' +
+            '\t\t\tfont-family: "Helvetica Neue"\n' +
+            '\t\t}\n' +
+            '\t\t#foo:hover {\n' +
+            '\t\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t\t}\n' +
+            '\t}\n' +
+            '}');
+        t(
+            'a:first-child{color:red;div:first-child{color:black;}}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            'a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            'a:first-child{color:red;div:not(.peq){color:black;}}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            'a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:not(.peq) {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
 
         // Newline Between Rules - (separator = "")
         reset_options();
         opts.newline_between_rules = false;
-        t('.div {}\n.span {}');
-        t('.div{}\n   \n.span{}', '.div {}\n.span {}');
-        t('.div {}    \n  \n.span { } \n', '.div {}\n.span {}');
-        t('.div {\n    \n} \n  .span {\n }  ', '.div {}\n.span {}');
-        t('.selector1 {\n\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n}\n.div{height:15px;}', '.selector1 {\n\tmargin: 0;\n\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n}\n.div {\n\theight: 15px;\n}');
-        t('.tabs{width:10px;//end of line comment\nheight:10px;//another\n}\n.div{height:15px;}', '.tabs {\n\twidth: 10px; //end of line comment\n\theight: 10px; //another\n}\n.div {\n\theight: 15px;\n}');
-        t('#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div {\n\theight: 15px;\n}');
-        t('@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div {\n\theight: 15px;\n}');
-        t('@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}');
-        t('a:first-child{color:red;div:first-child{color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:first-child {\n\t\tcolor: black;\n\t}\n}\n.div {\n\theight: 15px;\n}');
-        t('a:first-child{color:red;div:not(.peq){color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:not(.peq) {\n\t\tcolor: black;\n\t}\n}\n.div {\n\theight: 15px;\n}');
+        t(
+            '.div {}\n' +
+            '.span {}');
+        t(
+            '.div{}\n' +
+            '   \n' +
+            '.span{}',
+            //  -- output --
+            '.div {}\n' +
+            '.span {}');
+        t(
+            '.div {}    \n' +
+            '  \n' +
+            '.span { } \n',
+            //  -- output --
+            '.div {}\n' +
+            '.span {}');
+        t(
+            '.div {\n' +
+            '    \n' +
+            '} \n' +
+            '  .span {\n' +
+            ' }  ',
+            //  -- output --
+            '.div {}\n' +
+            '.span {}');
+        t(
+            '.selector1 {\n' +
+            '\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            '.selector1 {\n' +
+            '\tmargin: 0;\n' +
+            '\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            'height:10px;//another\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '\theight: 10px; //another\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            '#foo {\n' +
+            '\tbackground-image: url(foo@2x.png);\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            '#foo {\n' +
+            '\tbackground-image: url(foo@2x.png);\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t}\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t}\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            '@font-face {\n' +
+            '\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '}\n' +
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo.png);\n' +
+            '\t}\n' +
+            '\t@media screen and (min-device-pixel-ratio: 2) {\n' +
+            '\t\t@font-face {\n' +
+            '\t\t\tfont-family: "Helvetica Neue"\n' +
+            '\t\t}\n' +
+            '\t\t#foo:hover {\n' +
+            '\t\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t\t}\n' +
+            '\t}\n' +
+            '}');
+        t(
+            'a:first-child{color:red;div:first-child{color:black;}}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            'a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
+        t(
+            'a:first-child{color:red;div:not(.peq){color:black;}}\n' +
+            '.div{height:15px;}',
+            //  -- output --
+            'a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:not(.peq) {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}');
 
 
         //============================================================
@@ -383,54 +866,200 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         reset_options();
         t('.tabs(){}', '.tabs() {}');
         t('.tabs (){}', '.tabs () {}');
-        t('.tabs (pa, pa(1,2)), .cols { }', '.tabs (pa, pa(1, 2)),\n.cols {}');
-        t('.tabs(pa, pa(1,2)), .cols { }', '.tabs(pa, pa(1, 2)),\n.cols {}');
+        t(
+            '.tabs (pa, pa(1,2)), .cols { }',
+            //  -- output --
+            '.tabs (pa, pa(1, 2)),\n' +
+            '.cols {}');
+        t(
+            '.tabs(pa, pa(1,2)), .cols { }',
+            //  -- output --
+            '.tabs(pa, pa(1, 2)),\n' +
+            '.cols {}');
         t('.tabs (   )   {    }', '.tabs () {}');
         t('.tabs(   )   {    }', '.tabs() {}');
-        t('.tabs  (t, t2)  \n{\n  key: val(p1  ,p2);  \n  }', '.tabs (t, t2) {\n\tkey: val(p1, p2);\n}');
-        t('.box-shadow(@shadow: 0 1px 3px rgba(0, 0, 0, .25)) {\n\t-webkit-box-shadow: @shadow;\n\t-moz-box-shadow: @shadow;\n\tbox-shadow: @shadow;\n}');
+        t(
+            '.tabs  (t, t2)  \n' +
+            '{\n' +
+            '  key: val(p1  ,p2);  \n' +
+            '  }',
+            //  -- output --
+            '.tabs (t, t2) {\n' +
+            '\tkey: val(p1, p2);\n' +
+            '}');
+        t(
+            '.box-shadow(@shadow: 0 1px 3px rgba(0, 0, 0, .25)) {\n' +
+            '\t-webkit-box-shadow: @shadow;\n' +
+            '\t-moz-box-shadow: @shadow;\n' +
+            '\tbox-shadow: @shadow;\n' +
+            '}');
 
 
         //============================================================
         // Comments
         reset_options();
         t('/* test */');
-        t('.tabs{/* test */}', '.tabs {\n\t/* test */\n}');
-        t('.tabs{/* test */}', '.tabs {\n\t/* test */\n}');
-        t('/* header */.tabs {}', '/* header */\n\n.tabs {}');
-        t('.tabs {\n/* non-header */\nwidth:10px;}', '.tabs {\n\t/* non-header */\n\twidth: 10px;\n}');
+        t(
+            '.tabs{/* test */}',
+            //  -- output --
+            '.tabs {\n' +
+            '\t/* test */\n' +
+            '}');
+        t(
+            '.tabs{/* test */}',
+            //  -- output --
+            '.tabs {\n' +
+            '\t/* test */\n' +
+            '}');
+        t(
+            '/* header */.tabs {}',
+            //  -- output --
+            '/* header */\n' +
+            '\n' +
+            '.tabs {}');
+        t(
+            '.tabs {\n' +
+            '/* non-header */\n' +
+            'width:10px;}',
+            //  -- output --
+            '.tabs {\n' +
+            '\t/* non-header */\n' +
+            '\twidth: 10px;\n' +
+            '}');
         t('/* header');
         t('// comment');
-        t('.selector1 {\n\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n}', '.selector1 {\n\tmargin: 0;\n\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n}');
+        t(
+            '.selector1 {\n' +
+            '\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}',
+            //  -- output --
+            '.selector1 {\n' +
+            '\tmargin: 0;\n' +
+            '\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}');
         
         // single line comment support (less/sass)
-        t('.tabs{\n// comment\nwidth:10px;\n}', '.tabs {\n\t// comment\n\twidth: 10px;\n}');
-        t('.tabs{// comment\nwidth:10px;\n}', '.tabs {\n\t// comment\n\twidth: 10px;\n}');
-        t('//comment\n.tabs{width:10px;}', '//comment\n.tabs {\n\twidth: 10px;\n}');
-        t('.tabs{//comment\n//2nd single line comment\nwidth:10px;}', '.tabs {\n\t//comment\n\t//2nd single line comment\n\twidth: 10px;\n}');
-        t('.tabs{width:10px;//end of line comment\n}', '.tabs {\n\twidth: 10px; //end of line comment\n}');
-        t('.tabs{width:10px;//end of line comment\nheight:10px;}', '.tabs {\n\twidth: 10px; //end of line comment\n\theight: 10px;\n}');
-        t('.tabs{width:10px;//end of line comment\nheight:10px;//another\n}', '.tabs {\n\twidth: 10px; //end of line comment\n\theight: 10px; //another\n}');
+        t(
+            '.tabs{\n' +
+            '// comment\n' +
+            'width:10px;\n' +
+            '}',
+            //  -- output --
+            '.tabs {\n' +
+            '\t// comment\n' +
+            '\twidth: 10px;\n' +
+            '}');
+        t(
+            '.tabs{// comment\n' +
+            'width:10px;\n' +
+            '}',
+            //  -- output --
+            '.tabs {\n' +
+            '\t// comment\n' +
+            '\twidth: 10px;\n' +
+            '}');
+        t(
+            '//comment\n' +
+            '.tabs{width:10px;}',
+            //  -- output --
+            '//comment\n' +
+            '.tabs {\n' +
+            '\twidth: 10px;\n' +
+            '}');
+        t(
+            '.tabs{//comment\n' +
+            '//2nd single line comment\n' +
+            'width:10px;}',
+            //  -- output --
+            '.tabs {\n' +
+            '\t//comment\n' +
+            '\t//2nd single line comment\n' +
+            '\twidth: 10px;\n' +
+            '}');
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            '}',
+            //  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '}');
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            'height:10px;}',
+            //  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '\theight: 10px;\n' +
+            '}');
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            'height:10px;//another\n' +
+            '}',
+            //  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '\theight: 10px; //another\n' +
+            '}');
 
 
         //============================================================
         // Handle LESS property name interpolation
         reset_options();
-        t('tag {\n\t@{prop}: none;\n}');
-        t('tag{@{prop}:none;}', 'tag {\n\t@{prop}: none;\n}');
-        t('tag{ @{prop}: none;}', 'tag {\n\t@{prop}: none;\n}');
+        t(
+            'tag {\n' +
+            '\t@{prop}: none;\n' +
+            '}');
+        t(
+            'tag{@{prop}:none;}',
+            //  -- output --
+            'tag {\n' +
+            '\t@{prop}: none;\n' +
+            '}');
+        t(
+            'tag{ @{prop}: none;}',
+            //  -- output --
+            'tag {\n' +
+            '\t@{prop}: none;\n' +
+            '}');
         
         // can also be part of property name
-        t('tag {\n\tdynamic-@{prop}: none;\n}');
-        t('tag{dynamic-@{prop}:none;}', 'tag {\n\tdynamic-@{prop}: none;\n}');
-        t('tag{ dynamic-@{prop}: none;}', 'tag {\n\tdynamic-@{prop}: none;\n}');
+        t(
+            'tag {\n' +
+            '\tdynamic-@{prop}: none;\n' +
+            '}');
+        t(
+            'tag{dynamic-@{prop}:none;}',
+            //  -- output --
+            'tag {\n' +
+            '\tdynamic-@{prop}: none;\n' +
+            '}');
+        t(
+            'tag{ dynamic-@{prop}: none;}',
+            //  -- output --
+            'tag {\n' +
+            '\tdynamic-@{prop}: none;\n' +
+            '}');
 
 
         //============================================================
         // Handle LESS property name interpolation, test #631
         reset_options();
-        t('.generate-columns(@n, @i: 1) when (@i =< @n) {\n\t.column-@{i} {\n\t\twidth: (@i * 100% / @n);\n\t}\n\t.generate-columns(@n, (@i + 1));\n}');
-        t('.generate-columns(@n,@i:1) when (@i =< @n){.column-@{i}{width:(@i * 100% / @n);}.generate-columns(@n,(@i + 1));}', '.generate-columns(@n, @i: 1) when (@i =< @n) {\n\t.column-@{i} {\n\t\twidth: (@i * 100% / @n);\n\t}\n\t.generate-columns(@n, (@i + 1));\n}');
+        t(
+            '.generate-columns(@n, @i: 1) when (@i =< @n) {\n' +
+            '\t.column-@{i} {\n' +
+            '\t\twidth: (@i * 100% / @n);\n' +
+            '\t}\n' +
+            '\t.generate-columns(@n, (@i + 1));\n' +
+            '}');
+        t(
+            '.generate-columns(@n,@i:1) when (@i =< @n){.column-@{i}{width:(@i * 100% / @n);}.generate-columns(@n,(@i + 1));}',
+            //  -- output --
+            '.generate-columns(@n, @i: 1) when (@i =< @n) {\n' +
+            '\t.column-@{i} {\n' +
+            '\t\twidth: (@i * 100% / @n);\n' +
+            '\t}\n' +
+            '\t.generate-columns(@n, (@i + 1));\n' +
+            '}');
 
 
         //============================================================
@@ -448,7 +1077,12 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         reset_options();
         
         // Basic Interpolation
-        t('p {\n\t$font-size: 12px;\n\t$line-height: 30px;\n\tfont: #{$font-size}/#{$line-height};\n}');
+        t(
+            'p {\n' +
+            '\t$font-size: 12px;\n' +
+            '\t$line-height: 30px;\n' +
+            '\tfont: #{$font-size}/#{$line-height};\n' +
+            '}');
         t('p.#{$name} {}');
         t(
             '@mixin itemPropertiesCoverItem($items, $margin) {\n' +
@@ -474,7 +1108,14 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t('a ::b {}');
         t('a:b {}');
         t('a::b {}');
-        t('a {}, a::b {}, a   ::b {}, a:b {}, a   :b {}', 'a {}\n, a::b {}\n, a ::b {}\n, a:b {}\n, a :b {}');
+        t(
+            'a {}, a::b {}, a   ::b {}, a:b {}, a   :b {}',
+            //  -- output --
+            'a {}\n' +
+            ', a::b {}\n' +
+            ', a ::b {}\n' +
+            ', a:b {}\n' +
+            ', a :b {}');
         t(
             '.card-blue ::-webkit-input-placeholder {\n' +
             '\tcolor: #87D1FF;\n' +
diff --git a/js/test/generated/beautify-html-tests.js b/js/test/generated/beautify-html-tests.js
index 6353fbeda..b5a069a58 100644
--- a/js/test/generated/beautify-html-tests.js
+++ b/js/test/generated/beautify-html-tests.js
@@ -128,6 +128,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         reset_options();
         test_fragment(
             '<body><h1>Block</h1></body>',
+            //  -- output --
             '<body>\n' +
             '    <h1>Block</h1>\n' +
             '</body>');
@@ -154,28 +155,79 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         // Custom Extra Liners (empty) - ()
         reset_options();
         opts.extra_liners = [];
-        test_fragment('<html><head><meta></head><body><div><p>x</p></div></body></html>', '<html>\n<head>\n    <meta>\n</head>\n<body>\n    <div>\n        <p>x</p>\n    </div>\n</body>\n</html>');
+        test_fragment(
+            '<html><head><meta></head><body><div><p>x</p></div></body></html>',
+            //  -- output --
+            '<html>\n' +
+            '<head>\n' +
+            '    <meta>\n' +
+            '</head>\n' +
+            '<body>\n' +
+            '    <div>\n' +
+            '        <p>x</p>\n' +
+            '    </div>\n' +
+            '</body>\n' +
+            '</html>');
 
 
         //============================================================
         // Custom Extra Liners (default) - ()
         reset_options();
         opts.extra_liners = null;
-        test_fragment('<html><head></head><body></body></html>', '<html>\n\n<head></head>\n\n<body></body>\n\n</html>');
+        test_fragment(
+            '<html><head></head><body></body></html>',
+            //  -- output --
+            '<html>\n' +
+            '\n' +
+            '<head></head>\n' +
+            '\n' +
+            '<body></body>\n' +
+            '\n' +
+            '</html>');
 
 
         //============================================================
         // Custom Extra Liners (p, string) - ()
         reset_options();
         opts.extra_liners = 'p,/p';
-        test_fragment('<html><head><meta></head><body><div><p>x</p></div></body></html>', '<html>\n<head>\n    <meta>\n</head>\n<body>\n    <div>\n\n        <p>x\n\n        </p>\n    </div>\n</body>\n</html>');
+        test_fragment(
+            '<html><head><meta></head><body><div><p>x</p></div></body></html>',
+            //  -- output --
+            '<html>\n' +
+            '<head>\n' +
+            '    <meta>\n' +
+            '</head>\n' +
+            '<body>\n' +
+            '    <div>\n' +
+            '\n' +
+            '        <p>x\n' +
+            '\n' +
+            '        </p>\n' +
+            '    </div>\n' +
+            '</body>\n' +
+            '</html>');
 
 
         //============================================================
         // Custom Extra Liners (p) - ()
         reset_options();
         opts.extra_liners = ['p', '/p'];
-        test_fragment('<html><head><meta></head><body><div><p>x</p></div></body></html>', '<html>\n<head>\n    <meta>\n</head>\n<body>\n    <div>\n\n        <p>x\n\n        </p>\n    </div>\n</body>\n</html>');
+        test_fragment(
+            '<html><head><meta></head><body><div><p>x</p></div></body></html>',
+            //  -- output --
+            '<html>\n' +
+            '<head>\n' +
+            '    <meta>\n' +
+            '</head>\n' +
+            '<body>\n' +
+            '    <div>\n' +
+            '\n' +
+            '        <p>x\n' +
+            '\n' +
+            '        </p>\n' +
+            '    </div>\n' +
+            '</body>\n' +
+            '</html>');
 
 
         //============================================================
@@ -183,66 +235,79 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         reset_options();
         bth(
             '<script type="text/unknown"><div></div></script>',
+            //  -- output --
             '<script type="text/unknown">\n' +
             '    <div></div>\n' +
             '</script>');
         bth(
             '<script type="text/javascript"><div></div></script>',
+            //  -- output --
             '<script type="text/javascript">\n' +
             '    < div > < /div>\n' +
             '</script>');
         bth(
             '<script><div></div></script>',
+            //  -- output --
             '<script>\n' +
             '    < div > < /div>\n' +
             '</script>');
         bth(
             '<script>var foo = "bar";</script>',
+            //  -- output --
             '<script>\n' +
             '    var foo = "bar";\n' +
             '</script>');
         bth(
             '<script type="text/javascript">var foo = "bar";</script>',
+            //  -- output --
             '<script type="text/javascript">\n' +
             '    var foo = "bar";\n' +
             '</script>');
         bth(
             '<script type="application/javascript">var foo = "bar";</script>',
+            //  -- output --
             '<script type="application/javascript">\n' +
             '    var foo = "bar";\n' +
             '</script>');
         bth(
             '<script type="application/javascript;version=1.8">var foo = "bar";</script>',
+            //  -- output --
             '<script type="application/javascript;version=1.8">\n' +
             '    var foo = "bar";\n' +
             '</script>');
         bth(
             '<script type="application/x-javascript">var foo = "bar";</script>',
+            //  -- output --
             '<script type="application/x-javascript">\n' +
             '    var foo = "bar";\n' +
             '</script>');
         bth(
             '<script type="application/ecmascript">var foo = "bar";</script>',
+            //  -- output --
             '<script type="application/ecmascript">\n' +
             '    var foo = "bar";\n' +
             '</script>');
         bth(
             '<script type="dojo/aspect">this.domNode.style.display="none";</script>',
+            //  -- output --
             '<script type="dojo/aspect">\n' +
             '    this.domNode.style.display = "none";\n' +
             '</script>');
         bth(
             '<script type="dojo/method">this.domNode.style.display="none";</script>',
+            //  -- output --
             '<script type="dojo/method">\n' +
             '    this.domNode.style.display = "none";\n' +
             '</script>');
         bth(
             '<script type="text/javascript1.5">var foo = "bar";</script>',
+            //  -- output --
             '<script type="text/javascript1.5">\n' +
             '    var foo = "bar";\n' +
             '</script>');
         bth(
             '<script type="application/json">{"foo":"bar"}</script>',
+            //  -- output --
             '<script type="application/json">\n' +
             '    {\n' +
             '        "foo": "bar"\n' +
@@ -250,6 +315,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '</script>');
         bth(
             '<script type="application/ld+json">{"foo":"bar"}</script>',
+            //  -- output --
             '<script type="application/ld+json">\n' +
             '    {\n' +
             '        "foo": "bar"\n' +
@@ -257,21 +323,25 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '</script>');
         bth(
             '<style type="text/unknown"><tag></tag></style>',
+            //  -- output --
             '<style type="text/unknown">\n' +
             '    <tag></tag>\n' +
             '</style>');
         bth(
             '<style type="text/css"><tag></tag></style>',
+            //  -- output --
             '<style type="text/css">\n' +
             '    <tag></tag>\n' +
             '</style>');
         bth(
             '<style><tag></tag></style>',
+            //  -- output --
             '<style>\n' +
             '    <tag></tag>\n' +
             '</style>');
         bth(
             '<style>.selector {font-size:12px;}</style>',
+            //  -- output --
             '<style>\n' +
             '    .selector {\n' +
             '        font-size: 12px;\n' +
@@ -279,6 +349,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '</style>');
         bth(
             '<style type="text/css">.selector {font-size:12px;}</style>',
+            //  -- output --
             '<style type="text/css">\n' +
             '    .selector {\n' +
             '        font-size: 12px;\n' +
@@ -291,7 +362,15 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         reset_options();
         opts.wrap_attributes = 'force-aligned';
         opts.indent_with_tabs = true;
-        test_fragment('<div><div a="1" b="2"><div>test</div></div></div>', '<div>\n\t<div a="1"\n\t     b="2">\n\t\t<div>test</div>\n\t</div>\n</div>');
+        test_fragment(
+            '<div><div a="1" b="2"><div>test</div></div></div>',
+            //  -- output --
+            '<div>\n' +
+            '\t<div a="1"\n' +
+            '\t     b="2">\n' +
+            '\t\t<div>test</div>\n' +
+            '\t</div>\n' +
+            '</div>');
 
 
         //============================================================
@@ -299,7 +378,13 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         reset_options();
         opts.wrap_attributes = 'force-aligned';
         opts.indent_with_tabs = false;
-        bth('<div a="1" b="2"><div>test</div></div>', '<div a="1"\n     b="2">\n    <div>test</div>\n</div>');
+        bth(
+            '<div a="1" b="2"><div>test</div></div>',
+            //  -- output --
+            '<div a="1"\n' +
+            '     b="2">\n' +
+            '    <div>test</div>\n' +
+            '</div>');
 
 
         //============================================================
@@ -311,7 +396,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div attr0\n    attr1="123"\n    data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div lookatthissuperduperlongattributenamewhoahcrazy0="true"\n    attr0\n    attr1="123"\n    data-attr2="hello    t here"\n    heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0\n    attr1="123"\n    data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo"\n    attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo"\n    attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n    rel="stylesheet"\n    type="text/css">');
 
         // Attribute Wrap - (indent_attr = "\n    ", indent_attr_first = " ", indent_end = "", indent_end_selfclosing = " ", indent_over80 = "\n    ")
@@ -323,7 +412,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div attr0\n    attr1="123"\n    data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div lookatthissuperduperlongattributenamewhoahcrazy0="true"\n    attr0\n    attr1="123"\n    data-attr2="hello    t here"\n    heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0\n    attr1="123"\n    data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo"\n    attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo"\n    attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n    rel="stylesheet"\n    type="text/css">');
 
         // Attribute Wrap - (indent_attr = "\n        ", indent_attr_first = " ", indent_end = "", indent_end_selfclosing = " ", indent_over80 = "\n        ")
@@ -335,7 +428,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div attr0\n        attr1="123"\n        data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div lookatthissuperduperlongattributenamewhoahcrazy0="true"\n        attr0\n        attr1="123"\n        data-attr2="hello    t here"\n        heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0\n        attr1="123"\n        data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo"\n        attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo"\n        attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n        rel="stylesheet"\n        type="text/css">');
 
         // Attribute Wrap - (indent_attr = " ", indent_attr_first = " ", indent_end = "", indent_end_selfclosing = " ", indent_over80 = "\n")
@@ -348,7 +445,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here"\nheymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0 attr1="123" data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo" attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo" attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\nrel="stylesheet" type="text/css">');
 
         // Attribute Wrap - (indent_attr = " ", indent_attr_first = " ", indent_end = "", indent_end_selfclosing = " ", indent_over80 = "\n    ")
@@ -361,7 +462,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here"\n    heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0 attr1="123" data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo" attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo" attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n    rel="stylesheet" type="text/css">');
 
         // Attribute Wrap - (indent_attr = " ", indent_attr_first = " ", indent_end = "", indent_end_selfclosing = " ", indent_over80 = " ")
@@ -373,7 +478,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0 attr1="123" data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo" attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo" attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">');
 
         // Attribute Wrap - (indent_attr = "\n     ", indent_attr_faligned = " ", indent_attr_first = " ", indent_end = "", indent_end_selfclosing = " ", indent_over80 = "\n     ")
@@ -384,7 +493,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div attr0\n     attr1="123"\n     data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div lookatthissuperduperlongattributenamewhoahcrazy0="true"\n     attr0\n     attr1="123"\n     data-attr2="hello    t here"\n     heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0\n     attr1="123"\n     data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo"\n      attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo"\n      attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n      rel="stylesheet"\n      type="text/css">');
 
         // Attribute Wrap - (indent_attr = "\n     ", indent_attr_faligned = " ", indent_attr_first = " ", indent_end = "", indent_end_selfclosing = " ", indent_over80 = "\n     ")
@@ -396,7 +509,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div attr0\n     attr1="123"\n     data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div lookatthissuperduperlongattributenamewhoahcrazy0="true"\n     attr0\n     attr1="123"\n     data-attr2="hello    t here"\n     heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0\n     attr1="123"\n     data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo"\n      attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo"\n      attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n      rel="stylesheet"\n      type="text/css">');
 
         // Attribute Wrap - (indent_attr = "\n     ", indent_attr_faligned = " ", indent_attr_first = " ", indent_end = "", indent_end_selfclosing = " ", indent_over80 = "\n     ")
@@ -408,7 +525,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div attr0\n     attr1="123"\n     data-attr2="hello    t here">This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div lookatthissuperduperlongattributenamewhoahcrazy0="true"\n     attr0\n     attr1="123"\n     data-attr2="hello    t here"\n     heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img attr0\n     attr1="123"\n     data-attr2="hello    t here" />');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root attr1="foo"\n      attr2="bar" />');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root attr1="foo"\n      attr2="bar" />');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n      rel="stylesheet"\n      type="text/css">');
 
         // Attribute Wrap - (indent_attr = "\n    ", indent_attr_first = "\n    ", indent_end = "\n", indent_end_selfclosing = "\n", indent_over80 = "\n    ")
@@ -420,7 +541,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div\n    attr0\n    attr1="123"\n    data-attr2="hello    t here"\n>This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div\n    lookatthissuperduperlongattributenamewhoahcrazy0="true"\n    attr0\n    attr1="123"\n    data-attr2="hello    t here"\n    heymanimreallylongtoowhocomesupwiththesenames="false"\n>This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img\n    attr0\n    attr1="123"\n    data-attr2="hello    t here"\n/>');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root\n    attr1="foo"\n    attr2="bar"\n/>');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root\n    attr1="foo"\n    attr2="bar"\n/>');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link\n    href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n    rel="stylesheet"\n    type="text/css"\n>');
 
         // Attribute Wrap - (indent_attr = "\n    ", indent_attr_first = "\n    ", indent_end = "\n", indent_end_selfclosing = "\n", indent_over80 = "\n    ")
@@ -433,7 +558,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div\n    attr0\n    attr1="123"\n    data-attr2="hello    t here"\n>This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div\n    lookatthissuperduperlongattributenamewhoahcrazy0="true"\n    attr0\n    attr1="123"\n    data-attr2="hello    t here"\n    heymanimreallylongtoowhocomesupwiththesenames="false"\n>This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img\n    attr0\n    attr1="123"\n    data-attr2="hello    t here"\n/>');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root\n    attr1="foo"\n    attr2="bar"\n/>');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root\n    attr1="foo"\n    attr2="bar"\n/>');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link\n    href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n    rel="stylesheet"\n    type="text/css"\n>');
 
         // Attribute Wrap - (indent_attr = "\n        ", indent_attr_first = "\n        ", indent_end = "\n", indent_end_selfclosing = "\n", indent_over80 = "\n        ")
@@ -445,7 +574,11 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div attr0 attr1="123" data-attr2="hello    t here">This is some text</div>', '<div\n        attr0\n        attr1="123"\n        data-attr2="hello    t here"\n>This is some text</div>');
         test_fragment('<div lookatthissuperduperlongattributenamewhoahcrazy0="true" attr0 attr1="123" data-attr2="hello    t here" heymanimreallylongtoowhocomesupwiththesenames="false">This is some text</div>', '<div\n        lookatthissuperduperlongattributenamewhoahcrazy0="true"\n        attr0\n        attr1="123"\n        data-attr2="hello    t here"\n        heymanimreallylongtoowhocomesupwiththesenames="false"\n>This is some text</div>');
         test_fragment('<img attr0 attr1="123" data-attr2="hello    t here"/>', '<img\n        attr0\n        attr1="123"\n        data-attr2="hello    t here"\n/>');
-        test_fragment('<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>', '<?xml version="1.0" encoding="UTF-8" ?>\n<root\n        attr1="foo"\n        attr2="bar"\n/>');
+        test_fragment(
+            '<?xml version="1.0" encoding="UTF-8" ?><root attr1="foo" attr2="bar"/>',
+            //  -- output --
+            '<?xml version="1.0" encoding="UTF-8" ?>\n' +
+            '<root\n        attr1="foo"\n        attr2="bar"\n/>');
         test_fragment('<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin" rel="stylesheet" type="text/css">', '<link\n        href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,600,700,300&amp;subset=latin"\n        rel="stylesheet"\n        type="text/css"\n>');
 
 
@@ -454,11 +587,25 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         reset_options();
         opts.indent_handlebars = false;
         test_fragment(
-            '{{#if 0}}\n    <div>\n    </div>\n{{/if}}',
-            '{{#if 0}}\n<div>\n</div>\n{{/if}}');
+            '{{#if 0}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 0}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}');
         test_fragment(
-            '<div>\n{{#each thing}}\n    {{name}}\n{{/each}}\n</div>',
-            '<div>\n    {{#each thing}} {{name}} {{/each}}\n</div>');
+            '<div>\n' +
+            '{{#each thing}}\n' +
+            '    {{name}}\n' +
+            '{{/each}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#each thing}} {{name}} {{/each}}\n' +
+            '</div>');
 
 
         //============================================================
@@ -468,48 +615,133 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{field}}{{/if}}');
-        test_fragment('{{#if 0}}\n{{/if}}');
+        test_fragment(
+            '{{#if 0}}\n' +
+            '{{/if}}');
         test_fragment(
             '{{#if     words}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{field}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{field}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{field}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{field}}{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment(
-            '{{#if 1}}\n<div>\n</div>\n{{/if}}',
-            '{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment('<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
         test_fragment(
-            '<div>\n{{#if 1}}\n{{/if}}\n</div>',
-            '<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if}}\n{{#each}}\n{{#if}}\n{{field}}\n{{/if}}\n{{#if}}\n{{field}}\n{{/if}}\n{{/each}}\n{{/if}}',
-            '{{#if}}\n    {{#each}}\n        {{#if}}\n            {{field}}\n        {{/if}}\n        {{#if}}\n            {{field}}\n        {{/if}}\n    {{/each}}\n{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
+            '{{#if 1}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if 1}}\n    {{field}}\n    {{else}}\n    {{field}}\n{{/if}}',
-            '{{#if 1}}\n    {{field}}\n{{else}}\n    {{field}}\n{{/if}}');
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    {{else}}\n    {{/if}}',
-            '{{#if 1}}\n{{else}}\n{{/if}}');
+            '<div>\n' +
+            '{{#if 1}}\n' +
+            '{{/if}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if thing}}\n{{#if otherthing}}\n    {{field}}\n    {{else}}\n{{field}}\n    {{/if}}\n       {{else}}\n{{field}}\n{{/if}}',
-            '{{#if thing}}\n    {{#if otherthing}}\n        {{field}}\n    {{else}}\n        {{field}}\n    {{/if}}\n{{else}}\n    {{field}}\n{{/if}}');
+            '{{#if}}\n' +
+            '{{#each}}\n' +
+            '{{#if}}\n' +
+            '{{field}}\n' +
+            '{{/if}}\n' +
+            '{{#if}}\n' +
+            '{{field}}\n' +
+            '{{/if}}\n' +
+            '{{/each}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if}}\n' +
+            '    {{#each}}\n' +
+            '        {{#if}}\n' +
+            '            {{field}}\n' +
+            '        {{/if}}\n' +
+            '        {{#if}}\n' +
+            '            {{field}}\n' +
+            '        {{/if}}\n' +
+            '    {{/each}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{field}}\n' +
+            '    {{else}}\n' +
+            '    {{field}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    {{field}}\n' +
+            '{{else}}\n' +
+            '    {{field}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{else}}\n' +
+            '    {{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '{{else}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if thing}}\n' +
+            '{{#if otherthing}}\n' +
+            '    {{field}}\n' +
+            '    {{else}}\n' +
+            '{{field}}\n' +
+            '    {{/if}}\n' +
+            '       {{else}}\n' +
+            '{{field}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if thing}}\n' +
+            '    {{#if otherthing}}\n' +
+            '        {{field}}\n' +
+            '    {{else}}\n' +
+            '        {{field}}\n' +
+            '    {{/if}}\n' +
+            '{{else}}\n' +
+            '    {{field}}\n' +
+            '{{/if}}');
         test_fragment(
             '<div{{somestyle}}></div>',
+            //  -- output --
             '<div {{somestyle}}></div>');
         test_fragment(
             '<div{{#if test}}class="foo"{{/if}}>{{field}}</div>',
+            //  -- output --
             '<div {{#if test}} class="foo" {{/if}}>{{field}}</div>');
         test_fragment(
             '<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>{{field}}</div>',
+            //  -- output --
             '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>{{field}}</div>');
         test_fragment(
             '<span{{#if condition}}class="foo"{{/if}}>{{field}}</span>',
+            //  -- output --
             '<span {{#if condition}} class="foo" {{/if}}>{{field}}</span>');
         test_fragment('<div unformatted="{{#if}}{{field}}{{/if}}">{{field}}</div>');
         test_fragment('<div unformatted="{{#if  }}    {{field}}{{/if}}">{{field}}</div>');
@@ -526,48 +758,133 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{! comment}}{{/if}}');
-        test_fragment('{{#if 0}}\n{{/if}}');
+        test_fragment(
+            '{{#if 0}}\n' +
+            '{{/if}}');
         test_fragment(
             '{{#if     words}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{! comment}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{! comment}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{! comment}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{! comment}}{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
         test_fragment(
-            '{{#if 1}}\n<div>\n</div>\n{{/if}}',
-            '{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment('<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
-        test_fragment(
-            '<div>\n{{#if 1}}\n{{/if}}\n</div>',
-            '<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if}}\n{{#each}}\n{{#if}}\n{{! comment}}\n{{/if}}\n{{#if}}\n{{! comment}}\n{{/if}}\n{{/each}}\n{{/if}}',
-            '{{#if}}\n    {{#each}}\n        {{#if}}\n            {{! comment}}\n        {{/if}}\n        {{#if}}\n            {{! comment}}\n        {{/if}}\n    {{/each}}\n{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
+            '{{#if 1}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if 1}}\n    {{! comment}}\n    {{else}}\n    {{! comment}}\n{{/if}}',
-            '{{#if 1}}\n    {{! comment}}\n{{else}}\n    {{! comment}}\n{{/if}}');
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    {{else}}\n    {{/if}}',
-            '{{#if 1}}\n{{else}}\n{{/if}}');
+            '<div>\n' +
+            '{{#if 1}}\n' +
+            '{{/if}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if thing}}\n{{#if otherthing}}\n    {{! comment}}\n    {{else}}\n{{! comment}}\n    {{/if}}\n       {{else}}\n{{! comment}}\n{{/if}}',
-            '{{#if thing}}\n    {{#if otherthing}}\n        {{! comment}}\n    {{else}}\n        {{! comment}}\n    {{/if}}\n{{else}}\n    {{! comment}}\n{{/if}}');
+            '{{#if}}\n' +
+            '{{#each}}\n' +
+            '{{#if}}\n' +
+            '{{! comment}}\n' +
+            '{{/if}}\n' +
+            '{{#if}}\n' +
+            '{{! comment}}\n' +
+            '{{/if}}\n' +
+            '{{/each}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if}}\n' +
+            '    {{#each}}\n' +
+            '        {{#if}}\n' +
+            '            {{! comment}}\n' +
+            '        {{/if}}\n' +
+            '        {{#if}}\n' +
+            '            {{! comment}}\n' +
+            '        {{/if}}\n' +
+            '    {{/each}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{! comment}}\n' +
+            '    {{else}}\n' +
+            '    {{! comment}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    {{! comment}}\n' +
+            '{{else}}\n' +
+            '    {{! comment}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{else}}\n' +
+            '    {{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '{{else}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if thing}}\n' +
+            '{{#if otherthing}}\n' +
+            '    {{! comment}}\n' +
+            '    {{else}}\n' +
+            '{{! comment}}\n' +
+            '    {{/if}}\n' +
+            '       {{else}}\n' +
+            '{{! comment}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if thing}}\n' +
+            '    {{#if otherthing}}\n' +
+            '        {{! comment}}\n' +
+            '    {{else}}\n' +
+            '        {{! comment}}\n' +
+            '    {{/if}}\n' +
+            '{{else}}\n' +
+            '    {{! comment}}\n' +
+            '{{/if}}');
         test_fragment(
             '<div{{somestyle}}></div>',
+            //  -- output --
             '<div {{somestyle}}></div>');
         test_fragment(
             '<div{{#if test}}class="foo"{{/if}}>{{! comment}}</div>',
+            //  -- output --
             '<div {{#if test}} class="foo" {{/if}}>{{! comment}}</div>');
         test_fragment(
             '<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>{{! comment}}</div>',
+            //  -- output --
             '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>{{! comment}}</div>');
         test_fragment(
             '<span{{#if condition}}class="foo"{{/if}}>{{! comment}}</span>',
+            //  -- output --
             '<span {{#if condition}} class="foo" {{/if}}>{{! comment}}</span>');
         test_fragment('<div unformatted="{{#if}}{{! comment}}{{/if}}">{{! comment}}</div>');
         test_fragment('<div unformatted="{{#if  }}    {{! comment}}{{/if}}">{{! comment}}</div>');
@@ -584,48 +901,133 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{!-- comment--}}{{/if}}');
-        test_fragment('{{#if 0}}\n{{/if}}');
+        test_fragment(
+            '{{#if 0}}\n' +
+            '{{/if}}');
         test_fragment(
             '{{#if     words}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{!-- comment--}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{!-- comment--}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{!-- comment--}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{!-- comment--}}{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
         test_fragment(
-            '{{#if 1}}\n<div>\n</div>\n{{/if}}',
-            '{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment('<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
-        test_fragment(
-            '<div>\n{{#if 1}}\n{{/if}}\n</div>',
-            '<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if}}\n{{#each}}\n{{#if}}\n{{!-- comment--}}\n{{/if}}\n{{#if}}\n{{!-- comment--}}\n{{/if}}\n{{/each}}\n{{/if}}',
-            '{{#if}}\n    {{#each}}\n        {{#if}}\n            {{!-- comment--}}\n        {{/if}}\n        {{#if}}\n            {{!-- comment--}}\n        {{/if}}\n    {{/each}}\n{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
+            '{{#if 1}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if 1}}\n    {{!-- comment--}}\n    {{else}}\n    {{!-- comment--}}\n{{/if}}',
-            '{{#if 1}}\n    {{!-- comment--}}\n{{else}}\n    {{!-- comment--}}\n{{/if}}');
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    {{else}}\n    {{/if}}',
-            '{{#if 1}}\n{{else}}\n{{/if}}');
+            '<div>\n' +
+            '{{#if 1}}\n' +
+            '{{/if}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if thing}}\n{{#if otherthing}}\n    {{!-- comment--}}\n    {{else}}\n{{!-- comment--}}\n    {{/if}}\n       {{else}}\n{{!-- comment--}}\n{{/if}}',
-            '{{#if thing}}\n    {{#if otherthing}}\n        {{!-- comment--}}\n    {{else}}\n        {{!-- comment--}}\n    {{/if}}\n{{else}}\n    {{!-- comment--}}\n{{/if}}');
+            '{{#if}}\n' +
+            '{{#each}}\n' +
+            '{{#if}}\n' +
+            '{{!-- comment--}}\n' +
+            '{{/if}}\n' +
+            '{{#if}}\n' +
+            '{{!-- comment--}}\n' +
+            '{{/if}}\n' +
+            '{{/each}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if}}\n' +
+            '    {{#each}}\n' +
+            '        {{#if}}\n' +
+            '            {{!-- comment--}}\n' +
+            '        {{/if}}\n' +
+            '        {{#if}}\n' +
+            '            {{!-- comment--}}\n' +
+            '        {{/if}}\n' +
+            '    {{/each}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{!-- comment--}}\n' +
+            '    {{else}}\n' +
+            '    {{!-- comment--}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    {{!-- comment--}}\n' +
+            '{{else}}\n' +
+            '    {{!-- comment--}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{else}}\n' +
+            '    {{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '{{else}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if thing}}\n' +
+            '{{#if otherthing}}\n' +
+            '    {{!-- comment--}}\n' +
+            '    {{else}}\n' +
+            '{{!-- comment--}}\n' +
+            '    {{/if}}\n' +
+            '       {{else}}\n' +
+            '{{!-- comment--}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if thing}}\n' +
+            '    {{#if otherthing}}\n' +
+            '        {{!-- comment--}}\n' +
+            '    {{else}}\n' +
+            '        {{!-- comment--}}\n' +
+            '    {{/if}}\n' +
+            '{{else}}\n' +
+            '    {{!-- comment--}}\n' +
+            '{{/if}}');
         test_fragment(
             '<div{{somestyle}}></div>',
+            //  -- output --
             '<div {{somestyle}}></div>');
         test_fragment(
             '<div{{#if test}}class="foo"{{/if}}>{{!-- comment--}}</div>',
+            //  -- output --
             '<div {{#if test}} class="foo" {{/if}}>{{!-- comment--}}</div>');
         test_fragment(
             '<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>{{!-- comment--}}</div>',
+            //  -- output --
             '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>{{!-- comment--}}</div>');
         test_fragment(
             '<span{{#if condition}}class="foo"{{/if}}>{{!-- comment--}}</span>',
+            //  -- output --
             '<span {{#if condition}} class="foo" {{/if}}>{{!-- comment--}}</span>');
         test_fragment('<div unformatted="{{#if}}{{!-- comment--}}{{/if}}">{{!-- comment--}}</div>');
         test_fragment('<div unformatted="{{#if  }}    {{!-- comment--}}{{/if}}">{{!-- comment--}}</div>');
@@ -642,48 +1044,133 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{pre{{field1}} {{field2}} {{field3}}post{{/if}}');
-        test_fragment('{{#if 0}}\n{{/if}}');
+        test_fragment(
+            '{{#if 0}}\n' +
+            '{{/if}}');
         test_fragment(
             '{{#if     words}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{/if}}');
         test_fragment(
             '{{#if     words}}{pre{{field1}} {{field2}} {{field3}}post{{/if}}',
+            //  -- output --
             '{{#if words}}{pre{{field1}} {{field2}} {{field3}}post{{/if}}');
         test_fragment(
             '{{#if     words}}{pre{{field1}} {{field2}} {{field3}}post{{/if}}',
+            //  -- output --
             '{{#if words}}{pre{{field1}} {{field2}} {{field3}}post{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment(
-            '{{#if 1}}\n<div>\n</div>\n{{/if}}',
-            '{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment('<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
         test_fragment(
-            '<div>\n{{#if 1}}\n{{/if}}\n</div>',
-            '<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if}}\n{{#each}}\n{{#if}}\n{pre{{field1}} {{field2}} {{field3}}post\n{{/if}}\n{{#if}}\n{pre{{field1}} {{field2}} {{field3}}post\n{{/if}}\n{{/each}}\n{{/if}}',
-            '{{#if}}\n    {{#each}}\n        {{#if}}\n            {pre{{field1}} {{field2}} {{field3}}post\n        {{/if}}\n        {{#if}}\n            {pre{{field1}} {{field2}} {{field3}}post\n        {{/if}}\n    {{/each}}\n{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
+            '{{#if 1}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if 1}}\n    {pre{{field1}} {{field2}} {{field3}}post\n    {{else}}\n    {pre{{field1}} {{field2}} {{field3}}post\n{{/if}}',
-            '{{#if 1}}\n    {pre{{field1}} {{field2}} {{field3}}post\n{{else}}\n    {pre{{field1}} {{field2}} {{field3}}post\n{{/if}}');
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    {{else}}\n    {{/if}}',
-            '{{#if 1}}\n{{else}}\n{{/if}}');
+            '<div>\n' +
+            '{{#if 1}}\n' +
+            '{{/if}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if thing}}\n{{#if otherthing}}\n    {pre{{field1}} {{field2}} {{field3}}post\n    {{else}}\n{pre{{field1}} {{field2}} {{field3}}post\n    {{/if}}\n       {{else}}\n{pre{{field1}} {{field2}} {{field3}}post\n{{/if}}',
-            '{{#if thing}}\n    {{#if otherthing}}\n        {pre{{field1}} {{field2}} {{field3}}post\n    {{else}}\n        {pre{{field1}} {{field2}} {{field3}}post\n    {{/if}}\n{{else}}\n    {pre{{field1}} {{field2}} {{field3}}post\n{{/if}}');
+            '{{#if}}\n' +
+            '{{#each}}\n' +
+            '{{#if}}\n' +
+            '{pre{{field1}} {{field2}} {{field3}}post\n' +
+            '{{/if}}\n' +
+            '{{#if}}\n' +
+            '{pre{{field1}} {{field2}} {{field3}}post\n' +
+            '{{/if}}\n' +
+            '{{/each}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if}}\n' +
+            '    {{#each}}\n' +
+            '        {{#if}}\n' +
+            '            {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '        {{/if}}\n' +
+            '        {{#if}}\n' +
+            '            {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '        {{/if}}\n' +
+            '    {{/each}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '    {{else}}\n' +
+            '    {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '{{else}}\n' +
+            '    {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{else}}\n' +
+            '    {{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '{{else}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if thing}}\n' +
+            '{{#if otherthing}}\n' +
+            '    {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '    {{else}}\n' +
+            '{pre{{field1}} {{field2}} {{field3}}post\n' +
+            '    {{/if}}\n' +
+            '       {{else}}\n' +
+            '{pre{{field1}} {{field2}} {{field3}}post\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if thing}}\n' +
+            '    {{#if otherthing}}\n' +
+            '        {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '    {{else}}\n' +
+            '        {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '    {{/if}}\n' +
+            '{{else}}\n' +
+            '    {pre{{field1}} {{field2}} {{field3}}post\n' +
+            '{{/if}}');
         test_fragment(
             '<div{{somestyle}}></div>',
+            //  -- output --
             '<div {{somestyle}}></div>');
         test_fragment(
             '<div{{#if test}}class="foo"{{/if}}>{pre{{field1}} {{field2}} {{field3}}post</div>',
+            //  -- output --
             '<div {{#if test}} class="foo" {{/if}}>{pre{{field1}} {{field2}} {{field3}}post</div>');
         test_fragment(
             '<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>{pre{{field1}} {{field2}} {{field3}}post</div>',
+            //  -- output --
             '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>{pre{{field1}} {{field2}} {{field3}}post</div>');
         test_fragment(
             '<span{{#if condition}}class="foo"{{/if}}>{pre{{field1}} {{field2}} {{field3}}post</span>',
+            //  -- output --
             '<span {{#if condition}} class="foo" {{/if}}>{pre{{field1}} {{field2}} {{field3}}post</span>');
         test_fragment('<div unformatted="{{#if}}{pre{{field1}} {{field2}} {{field3}}post{{/if}}">{pre{{field1}} {{field2}} {{field3}}post</div>');
         test_fragment('<div unformatted="{{#if  }}    {pre{{field1}} {{field2}} {{field3}}post{{/if}}">{pre{{field1}} {{field2}} {{field3}}post</div>');
@@ -700,48 +1187,133 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{! \n mult-line\ncomment  \n     with spacing\n}}{{/if}}');
-        test_fragment('{{#if 0}}\n{{/if}}');
+        test_fragment(
+            '{{#if 0}}\n' +
+            '{{/if}}');
         test_fragment(
             '{{#if     words}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{! \n mult-line\ncomment  \n     with spacing\n}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{! \n mult-line\ncomment  \n     with spacing\n}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{! \n mult-line\ncomment  \n     with spacing\n}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{! \n mult-line\ncomment  \n     with spacing\n}}{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment(
-            '{{#if 1}}\n<div>\n</div>\n{{/if}}',
-            '{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment('<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
         test_fragment(
-            '<div>\n{{#if 1}}\n{{/if}}\n</div>',
-            '<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if}}\n{{#each}}\n{{#if}}\n{{! \n mult-line\ncomment  \n     with spacing\n}}\n{{/if}}\n{{#if}}\n{{! \n mult-line\ncomment  \n     with spacing\n}}\n{{/if}}\n{{/each}}\n{{/if}}',
-            '{{#if}}\n    {{#each}}\n        {{#if}}\n            {{! \n mult-line\ncomment  \n     with spacing\n}}\n        {{/if}}\n        {{#if}}\n            {{! \n mult-line\ncomment  \n     with spacing\n}}\n        {{/if}}\n    {{/each}}\n{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
+            '{{#if 1}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if 1}}\n    {{! \n mult-line\ncomment  \n     with spacing\n}}\n    {{else}}\n    {{! \n mult-line\ncomment  \n     with spacing\n}}\n{{/if}}',
-            '{{#if 1}}\n    {{! \n mult-line\ncomment  \n     with spacing\n}}\n{{else}}\n    {{! \n mult-line\ncomment  \n     with spacing\n}}\n{{/if}}');
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    {{else}}\n    {{/if}}',
-            '{{#if 1}}\n{{else}}\n{{/if}}');
+            '<div>\n' +
+            '{{#if 1}}\n' +
+            '{{/if}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if thing}}\n{{#if otherthing}}\n    {{! \n mult-line\ncomment  \n     with spacing\n}}\n    {{else}}\n{{! \n mult-line\ncomment  \n     with spacing\n}}\n    {{/if}}\n       {{else}}\n{{! \n mult-line\ncomment  \n     with spacing\n}}\n{{/if}}',
-            '{{#if thing}}\n    {{#if otherthing}}\n        {{! \n mult-line\ncomment  \n     with spacing\n}}\n    {{else}}\n        {{! \n mult-line\ncomment  \n     with spacing\n}}\n    {{/if}}\n{{else}}\n    {{! \n mult-line\ncomment  \n     with spacing\n}}\n{{/if}}');
+            '{{#if}}\n' +
+            '{{#each}}\n' +
+            '{{#if}}\n' +
+            '{{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '{{/if}}\n' +
+            '{{#if}}\n' +
+            '{{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '{{/if}}\n' +
+            '{{/each}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if}}\n' +
+            '    {{#each}}\n' +
+            '        {{#if}}\n' +
+            '            {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '        {{/if}}\n' +
+            '        {{#if}}\n' +
+            '            {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '        {{/if}}\n' +
+            '    {{/each}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '    {{else}}\n' +
+            '    {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '{{else}}\n' +
+            '    {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{else}}\n' +
+            '    {{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '{{else}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if thing}}\n' +
+            '{{#if otherthing}}\n' +
+            '    {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '    {{else}}\n' +
+            '{{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '    {{/if}}\n' +
+            '       {{else}}\n' +
+            '{{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if thing}}\n' +
+            '    {{#if otherthing}}\n' +
+            '        {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '    {{else}}\n' +
+            '        {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '    {{/if}}\n' +
+            '{{else}}\n' +
+            '    {{! \n mult-line\ncomment  \n     with spacing\n}}\n' +
+            '{{/if}}');
         test_fragment(
             '<div{{somestyle}}></div>',
+            //  -- output --
             '<div {{somestyle}}></div>');
         test_fragment(
             '<div{{#if test}}class="foo"{{/if}}>{{! \n mult-line\ncomment  \n     with spacing\n}}</div>',
+            //  -- output --
             '<div {{#if test}} class="foo" {{/if}}>{{! \n mult-line\ncomment  \n     with spacing\n}}</div>');
         test_fragment(
             '<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>{{! \n mult-line\ncomment  \n     with spacing\n}}</div>',
+            //  -- output --
             '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>{{! \n mult-line\ncomment  \n     with spacing\n}}</div>');
         test_fragment(
             '<span{{#if condition}}class="foo"{{/if}}>{{! \n mult-line\ncomment  \n     with spacing\n}}</span>',
+            //  -- output --
             '<span {{#if condition}} class="foo" {{/if}}>{{! \n mult-line\ncomment  \n     with spacing\n}}</span>');
         test_fragment('<div unformatted="{{#if}}{{! \n mult-line\ncomment  \n     with spacing\n}}{{/if}}">{{! \n mult-line\ncomment  \n     with spacing\n}}</div>');
         test_fragment('<div unformatted="{{#if  }}    {{! \n mult-line\ncomment  \n     with spacing\n}}{{/if}}">{{! \n mult-line\ncomment  \n     with spacing\n}}</div>');
@@ -758,48 +1330,133 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{!-- \n mult-line\ncomment  \n     with spacing\n--}}{{/if}}');
-        test_fragment('{{#if 0}}\n{{/if}}');
+        test_fragment(
+            '{{#if 0}}\n' +
+            '{{/if}}');
         test_fragment(
             '{{#if     words}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{!-- \n mult-line\ncomment  \n     with spacing\n--}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{!-- \n mult-line\ncomment  \n     with spacing\n--}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{!-- \n mult-line\ncomment  \n     with spacing\n--}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{!-- \n mult-line\ncomment  \n     with spacing\n--}}{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
         test_fragment(
-            '{{#if 1}}\n<div>\n</div>\n{{/if}}',
-            '{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment('<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
-        test_fragment(
-            '<div>\n{{#if 1}}\n{{/if}}\n</div>',
-            '<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if}}\n{{#each}}\n{{#if}}\n{{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n{{/if}}\n{{#if}}\n{{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n{{/if}}\n{{/each}}\n{{/if}}',
-            '{{#if}}\n    {{#each}}\n        {{#if}}\n            {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n        {{/if}}\n        {{#if}}\n            {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n        {{/if}}\n    {{/each}}\n{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
+            '{{#if 1}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if 1}}\n    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n    {{else}}\n    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n{{/if}}',
-            '{{#if 1}}\n    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n{{else}}\n    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n{{/if}}');
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    {{else}}\n    {{/if}}',
-            '{{#if 1}}\n{{else}}\n{{/if}}');
+            '<div>\n' +
+            '{{#if 1}}\n' +
+            '{{/if}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if thing}}\n{{#if otherthing}}\n    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n    {{else}}\n{{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n    {{/if}}\n       {{else}}\n{{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n{{/if}}',
-            '{{#if thing}}\n    {{#if otherthing}}\n        {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n    {{else}}\n        {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n    {{/if}}\n{{else}}\n    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n{{/if}}');
+            '{{#if}}\n' +
+            '{{#each}}\n' +
+            '{{#if}}\n' +
+            '{{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '{{/if}}\n' +
+            '{{#if}}\n' +
+            '{{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '{{/if}}\n' +
+            '{{/each}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if}}\n' +
+            '    {{#each}}\n' +
+            '        {{#if}}\n' +
+            '            {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '        {{/if}}\n' +
+            '        {{#if}}\n' +
+            '            {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '        {{/if}}\n' +
+            '    {{/each}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '    {{else}}\n' +
+            '    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '{{else}}\n' +
+            '    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{else}}\n' +
+            '    {{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '{{else}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if thing}}\n' +
+            '{{#if otherthing}}\n' +
+            '    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '    {{else}}\n' +
+            '{{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '    {{/if}}\n' +
+            '       {{else}}\n' +
+            '{{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if thing}}\n' +
+            '    {{#if otherthing}}\n' +
+            '        {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '    {{else}}\n' +
+            '        {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '    {{/if}}\n' +
+            '{{else}}\n' +
+            '    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}\n' +
+            '{{/if}}');
         test_fragment(
             '<div{{somestyle}}></div>',
+            //  -- output --
             '<div {{somestyle}}></div>');
         test_fragment(
             '<div{{#if test}}class="foo"{{/if}}>{{!-- \n mult-line\ncomment  \n     with spacing\n--}}</div>',
+            //  -- output --
             '<div {{#if test}} class="foo" {{/if}}>{{!-- \n mult-line\ncomment  \n     with spacing\n--}}</div>');
         test_fragment(
             '<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>{{!-- \n mult-line\ncomment  \n     with spacing\n--}}</div>',
+            //  -- output --
             '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>{{!-- \n mult-line\ncomment  \n     with spacing\n--}}</div>');
         test_fragment(
             '<span{{#if condition}}class="foo"{{/if}}>{{!-- \n mult-line\ncomment  \n     with spacing\n--}}</span>',
+            //  -- output --
             '<span {{#if condition}} class="foo" {{/if}}>{{!-- \n mult-line\ncomment  \n     with spacing\n--}}</span>');
         test_fragment('<div unformatted="{{#if}}{{!-- \n mult-line\ncomment  \n     with spacing\n--}}{{/if}}">{{!-- \n mult-line\ncomment  \n     with spacing\n--}}</div>');
         test_fragment('<div unformatted="{{#if  }}    {{!-- \n mult-line\ncomment  \n     with spacing\n--}}{{/if}}">{{!-- \n mult-line\ncomment  \n     with spacing\n--}}</div>');
@@ -816,48 +1473,133 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}{{/if}}');
-        test_fragment('{{#if 0}}\n{{/if}}');
+        test_fragment(
+            '{{#if 0}}\n' +
+            '{{/if}}');
         test_fragment(
             '{{#if     words}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}{{/if}}');
         test_fragment(
             '{{#if     words}}{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment(
-            '{{#if 1}}\n<div>\n</div>\n{{/if}}',
-            '{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment('<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
         test_fragment(
-            '<div>\n{{#if 1}}\n{{/if}}\n</div>',
-            '<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if}}\n{{#each}}\n{{#if}}\n{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n{{/if}}\n{{#if}}\n{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n{{/if}}\n{{/each}}\n{{/if}}',
-            '{{#if}}\n    {{#each}}\n        {{#if}}\n            {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n        {{/if}}\n        {{#if}}\n            {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n        {{/if}}\n    {{/each}}\n{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
+            '{{#if 1}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if 1}}\n    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n    {{else}}\n    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n{{/if}}',
-            '{{#if 1}}\n    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n{{else}}\n    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n{{/if}}');
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    {{else}}\n    {{/if}}',
-            '{{#if 1}}\n{{else}}\n{{/if}}');
+            '<div>\n' +
+            '{{#if 1}}\n' +
+            '{{/if}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if thing}}\n{{#if otherthing}}\n    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n    {{else}}\n{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n    {{/if}}\n       {{else}}\n{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n{{/if}}',
-            '{{#if thing}}\n    {{#if otherthing}}\n        {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n    {{else}}\n        {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n    {{/if}}\n{{else}}\n    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n{{/if}}');
+            '{{#if}}\n' +
+            '{{#each}}\n' +
+            '{{#if}}\n' +
+            '{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '{{/if}}\n' +
+            '{{#if}}\n' +
+            '{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '{{/if}}\n' +
+            '{{/each}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if}}\n' +
+            '    {{#each}}\n' +
+            '        {{#if}}\n' +
+            '            {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '        {{/if}}\n' +
+            '        {{#if}}\n' +
+            '            {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '        {{/if}}\n' +
+            '    {{/each}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '    {{else}}\n' +
+            '    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '{{else}}\n' +
+            '    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{else}}\n' +
+            '    {{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '{{else}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if thing}}\n' +
+            '{{#if otherthing}}\n' +
+            '    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '    {{else}}\n' +
+            '{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '    {{/if}}\n' +
+            '       {{else}}\n' +
+            '{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if thing}}\n' +
+            '    {{#if otherthing}}\n' +
+            '        {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '    {{else}}\n' +
+            '        {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '    {{/if}}\n' +
+            '{{else}}\n' +
+            '    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}\n' +
+            '{{/if}}');
         test_fragment(
             '<div{{somestyle}}></div>',
+            //  -- output --
             '<div {{somestyle}}></div>');
         test_fragment(
             '<div{{#if test}}class="foo"{{/if}}>{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}</div>',
+            //  -- output --
             '<div {{#if test}} class="foo" {{/if}}>{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}</div>');
         test_fragment(
             '<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}</div>',
+            //  -- output --
             '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}</div>');
         test_fragment(
             '<span{{#if condition}}class="foo"{{/if}}>{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}</span>',
+            //  -- output --
             '<span {{#if condition}} class="foo" {{/if}}>{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}</span>');
         test_fragment('<div unformatted="{{#if}}{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}{{/if}}">{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}</div>');
         test_fragment('<div unformatted="{{#if  }}    {{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}{{/if}}">{{!-- \n mult-line\ncomment \n{{#> component}}\n mult-line\ncomment  \n     with spacing\n {{/ component}}--}}</div>');
@@ -875,48 +1617,133 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}content{{/if}}');
-        test_fragment('{{#if 0}}\n{{/if}}');
+        test_fragment(
+            '{{#if 0}}\n' +
+            '{{/if}}');
         test_fragment(
             '{{#if     words}}{{/if}}',
+            //  -- output --
             '{{#if words}}{{/if}}');
         test_fragment(
             '{{#if     words}}content{{/if}}',
+            //  -- output --
             '{{#if words}}content{{/if}}');
         test_fragment(
             '{{#if     words}}content{{/if}}',
+            //  -- output --
             '{{#if words}}content{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
         test_fragment(
-            '{{#if 1}}\n<div>\n</div>\n{{/if}}',
-            '{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
-        test_fragment('<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '<div>\n{{#if 1}}\n{{/if}}\n</div>',
-            '<div>\n    {{#if 1}}\n    {{/if}}\n</div>');
+            '{{#if 1}}\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if}}\n{{#each}}\n{{#if}}\ncontent\n{{/if}}\n{{#if}}\ncontent\n{{/if}}\n{{/each}}\n{{/if}}',
-            '{{#if}}\n    {{#each}}\n        {{#if}}\n            content\n        {{/if}}\n        {{#if}}\n            content\n        {{/if}}\n    {{/each}}\n{{/if}}');
-        test_fragment('{{#if 1}}\n    <div>\n    </div>\n{{/if}}');
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    content\n    {{else}}\n    content\n{{/if}}',
-            '{{#if 1}}\n    content\n{{else}}\n    content\n{{/if}}');
+            '<div>\n' +
+            '{{#if 1}}\n' +
+            '{{/if}}\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    {{#if 1}}\n' +
+            '    {{/if}}\n' +
+            '</div>');
         test_fragment(
-            '{{#if 1}}\n    {{else}}\n    {{/if}}',
-            '{{#if 1}}\n{{else}}\n{{/if}}');
+            '{{#if}}\n' +
+            '{{#each}}\n' +
+            '{{#if}}\n' +
+            'content\n' +
+            '{{/if}}\n' +
+            '{{#if}}\n' +
+            'content\n' +
+            '{{/if}}\n' +
+            '{{/each}}\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if}}\n' +
+            '    {{#each}}\n' +
+            '        {{#if}}\n' +
+            '            content\n' +
+            '        {{/if}}\n' +
+            '        {{#if}}\n' +
+            '            content\n' +
+            '        {{/if}}\n' +
+            '    {{/each}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '{{/if}}');
         test_fragment(
-            '{{#if thing}}\n{{#if otherthing}}\n    content\n    {{else}}\ncontent\n    {{/if}}\n       {{else}}\ncontent\n{{/if}}',
-            '{{#if thing}}\n    {{#if otherthing}}\n        content\n    {{else}}\n        content\n    {{/if}}\n{{else}}\n    content\n{{/if}}');
+            '{{#if 1}}\n' +
+            '    content\n' +
+            '    {{else}}\n' +
+            '    content\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '    content\n' +
+            '{{else}}\n' +
+            '    content\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if 1}}\n' +
+            '    {{else}}\n' +
+            '    {{/if}}',
+            //  -- output --
+            '{{#if 1}}\n' +
+            '{{else}}\n' +
+            '{{/if}}');
+        test_fragment(
+            '{{#if thing}}\n' +
+            '{{#if otherthing}}\n' +
+            '    content\n' +
+            '    {{else}}\n' +
+            'content\n' +
+            '    {{/if}}\n' +
+            '       {{else}}\n' +
+            'content\n' +
+            '{{/if}}',
+            //  -- output --
+            '{{#if thing}}\n' +
+            '    {{#if otherthing}}\n' +
+            '        content\n' +
+            '    {{else}}\n' +
+            '        content\n' +
+            '    {{/if}}\n' +
+            '{{else}}\n' +
+            '    content\n' +
+            '{{/if}}');
         test_fragment(
             '<div{{somestyle}}></div>',
+            //  -- output --
             '<div {{somestyle}}></div>');
         test_fragment(
             '<div{{#if test}}class="foo"{{/if}}>content</div>',
+            //  -- output --
             '<div {{#if test}} class="foo" {{/if}}>content</div>');
         test_fragment(
             '<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>content</div>',
+            //  -- output --
             '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>content</div>');
         test_fragment(
             '<span{{#if condition}}class="foo"{{/if}}>content</span>',
+            //  -- output --
             '<span {{#if condition}} class="foo" {{/if}}>content</span>');
         test_fragment('<div unformatted="{{#if}}content{{/if}}">content</div>');
         test_fragment('<div unformatted="{{#if  }}    content{{/if}}">content</div>');
@@ -934,33 +1761,64 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         opts.indent_handlebars = true;
         test_fragment(
             '{{#if test}}<div></div>{{else}}<div></div>{{/if}}',
-            '{{#if test}}\n    <div></div>\n{{else}}\n    <div></div>\n{{/if}}');
+            //  -- output --
+            '{{#if test}}\n' +
+            '    <div></div>\n' +
+            '{{else}}\n' +
+            '    <div></div>\n' +
+            '{{/if}}');
         test_fragment('{{#if test}}<span></span>{{else}}<span></span>{{/if}}');
 
 
         //============================================================
         // Unclosed html elements
         reset_options();
-        test_fragment('<source>\n<source>');
-        test_fragment('<br>\n<br>');
-        test_fragment('<input>\n<input>');
-        test_fragment('<meta>\n<meta>');
-        test_fragment('<link>\n<link>');
-        test_fragment('<colgroup>\n    <col>\n    <col>\n</colgroup>');
+        test_fragment(
+            '<source>\n' +
+            '<source>');
+        test_fragment(
+            '<br>\n' +
+            '<br>');
+        test_fragment(
+            '<input>\n' +
+            '<input>');
+        test_fragment(
+            '<meta>\n' +
+            '<meta>');
+        test_fragment(
+            '<link>\n' +
+            '<link>');
+        test_fragment(
+            '<colgroup>\n' +
+            '    <col>\n' +
+            '    <col>\n' +
+            '</colgroup>');
 
 
         //============================================================
         // Unformatted tags
         reset_options();
         test_fragment(
-            '<ol>\n    <li>b<pre>c</pre></li>\n</ol>',
+            '<ol>\n' +
+            '    <li>b<pre>c</pre></li>\n' +
+            '</ol>',
+            //  -- output --
             '<ol>\n' +
             '    <li>b\n' +
             '        <pre>c</pre>\n' +
             '    </li>\n' +
             '</ol>');
-        test_fragment('<ol>\n    <li>b<code>c</code></li>\n</ol>');
-        test_fragment('<ul>\n    <li>\n        <span class="octicon octicon-person"></span>\n        <a href="/contact/">Kontakt</a>\n    </li>\n</ul>');
+        test_fragment(
+            '<ol>\n' +
+            '    <li>b<code>c</code></li>\n' +
+            '</ol>');
+        test_fragment(
+            '<ul>\n' +
+            '    <li>\n' +
+            '        <span class="octicon octicon-person"></span>\n' +
+            '        <a href="/contact/">Kontakt</a>\n' +
+            '    </li>\n' +
+            '</ul>');
         test_fragment('<div class="searchform"><input type="text" value="" name="s" id="s" /><input type="submit" id="searchsubmit" value="Search" /></div>');
         test_fragment('<div class="searchform"><input type="text" value="" name="s" id="s"><input type="submit" id="searchsubmit" value="Search"></div>');
 
@@ -982,7 +1840,12 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         //============================================================
         // Php formatting
         reset_options();
-        test_fragment('<h1 class="content-page-header"><?=$view["name"]; ?></h1>', '<h1 class="content-page-header">\n    <?=$view["name"]; ?>\n</h1>');
+        test_fragment(
+            '<h1 class="content-page-header"><?=$view["name"]; ?></h1>',
+            //  -- output --
+            '<h1 class="content-page-header">\n' +
+            '    <?=$view["name"]; ?>\n' +
+            '</h1>');
         test_fragment(
             '<?php\n' +
             'for($i = 1; $i <= 100; $i++;) {\n' +
@@ -1076,8 +1939,15 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         reset_options();
         opts.indent_with_tabs = true;
         test_fragment(
-            '<div>\n<div>\n</div>\n</div>',
-            '<div>\n\t<div>\n\t</div>\n</div>');
+            '<div>\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '\t<div>\n' +
+            '\t</div>\n' +
+            '</div>');
 
 
         //============================================================
@@ -1085,34 +1955,82 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         reset_options();
         opts.indent_with_tabs = false;
         test_fragment(
-            '<div>\n<div>\n</div>\n</div>',
-            '<div>\n    <div>\n    </div>\n</div>');
+            '<div>\n' +
+            '<div>\n' +
+            '</div>\n' +
+            '</div>',
+            //  -- output --
+            '<div>\n' +
+            '    <div>\n' +
+            '    </div>\n' +
+            '</div>');
 
 
         //============================================================
         // Indent body inner html by default
         reset_options();
-        test_fragment('<html>\n<body>\n<div></div>\n</body>\n\n</html>', '<html>\n<body>\n    <div></div>\n</body>\n\n</html>');
+        test_fragment(
+            '<html>\n' +
+            '<body>\n' +
+            '<div></div>\n' +
+            '</body>\n' +
+            '\n' +
+            '</html>',
+            //  -- output --
+            '<html>\n' +
+            '<body>\n' +
+            '    <div></div>\n' +
+            '</body>\n' +
+            '\n' +
+            '</html>');
 
 
         //============================================================
         // indent_body_inner_html set to false prevents indent of body inner html
         reset_options();
         opts.indent_body_inner_html = false;
-        test_fragment('<html>\n<body>\n<div></div>\n</body>\n\n</html>');
+        test_fragment(
+            '<html>\n' +
+            '<body>\n' +
+            '<div></div>\n' +
+            '</body>\n' +
+            '\n' +
+            '</html>');
 
 
         //============================================================
         // Indent head inner html by default
         reset_options();
-        test_fragment('<html>\n\n<head>\n<meta>\n</head>\n\n</html>', '<html>\n\n<head>\n    <meta>\n</head>\n\n</html>');
+        test_fragment(
+            '<html>\n' +
+            '\n' +
+            '<head>\n' +
+            '<meta>\n' +
+            '</head>\n' +
+            '\n' +
+            '</html>',
+            //  -- output --
+            '<html>\n' +
+            '\n' +
+            '<head>\n' +
+            '    <meta>\n' +
+            '</head>\n' +
+            '\n' +
+            '</html>');
 
 
         //============================================================
         // indent_head_inner_html set to false prevents indent of head inner html
         reset_options();
         opts.indent_head_inner_html = false;
-        test_fragment('<html>\n\n<head>\n<meta>\n</head>\n\n</html>');
+        test_fragment(
+            '<html>\n' +
+            '\n' +
+            '<head>\n' +
+            '<meta>\n' +
+            '</head>\n' +
+            '\n' +
+            '</html>');
 
 
         //============================================================
@@ -1121,6 +2039,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         opts.content_unformatted = ['script', 'style', 'p', 'span', 'br'];
         test_fragment(
             '<html><body><h1>A</h1><script>if(1){f();}</script><style>.a{display:none;}</style></body></html>',
+            //  -- output --
             '<html>\n' +
             '<body>\n' +
             '    <h1>A</h1>\n' +
@@ -1131,12 +2050,18 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '</html>');
         test_fragment(
             '<div><p>Beautify me</p></div><p><p>But not me</p></p>',
+            //  -- output --
             '<div>\n' +
             '    <p>Beautify me</p>\n' +
             '</div>\n' +
             '<p><p>But not me</p></p>');
         test_fragment(
-            '<div><p\n  class="beauty-me"\n>Beautify me</p></div><p><p\n  class="iamalreadybeauty"\n>But not me</p></p>',
+            '<div><p\n' +
+            '  class="beauty-me"\n' +
+            '>Beautify me</p></div><p><p\n' +
+            '  class="iamalreadybeauty"\n' +
+            '>But not me</p></p>',
+            //  -- output --
             '<div>\n' +
             '    <p class="beauty-me">Beautify me</p>\n' +
             '</div>\n' +
@@ -1146,12 +2071,18 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div><span>blabla<div>something here</div></span></div>');
         test_fragment('<div><br /></div>');
         test_fragment(
-            '<div><pre>var a=1;\nvar b=a;</pre></div>',
+            '<div><pre>var a=1;\n' +
+            'var b=a;</pre></div>',
+            //  -- output --
             '<div>\n' +
             '    <pre>var a=1; var b=a;</pre>\n' +
             '</div>');
         test_fragment(
-            '<div><pre>\nvar a=1;\nvar b=a;\n</pre></div>',
+            '<div><pre>\n' +
+            'var a=1;\n' +
+            'var b=a;\n' +
+            '</pre></div>',
+            //  -- output --
             '<div>\n' +
             '    <pre>\n' +
             '        var a=1; var b=a;\n' +
@@ -1164,6 +2095,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         reset_options();
         test_fragment(
             '<html><body><h1>A</h1><script>if(1){f();}</script><style>.a{display:none;}</style></body></html>',
+            //  -- output --
             '<html>\n' +
             '<body>\n' +
             '    <h1>A</h1>\n' +
@@ -1182,6 +2114,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '</html>');
         test_fragment(
             '<div><p>Beautify me</p></div><p><p>But not me</p></p>',
+            //  -- output --
             '<div>\n' +
             '    <p>Beautify me</p>\n' +
             '</div>\n' +
@@ -1189,7 +2122,12 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '    <p>But not me</p>\n' +
             '</p>');
         test_fragment(
-            '<div><p\n  class="beauty-me"\n>Beautify me</p></div><p><p\n  class="iamalreadybeauty"\n>But not me</p></p>',
+            '<div><p\n' +
+            '  class="beauty-me"\n' +
+            '>Beautify me</p></div><p><p\n' +
+            '  class="iamalreadybeauty"\n' +
+            '>But not me</p></p>',
+            //  -- output --
             '<div>\n' +
             '    <p class="beauty-me">Beautify me</p>\n' +
             '</div>\n' +
@@ -1199,13 +2137,19 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         test_fragment('<div><span>blabla<div>something here</div></span></div>');
         test_fragment('<div><br /></div>');
         test_fragment(
-            '<div><pre>var a=1;\nvar b=a;</pre></div>',
+            '<div><pre>var a=1;\n' +
+            'var b=a;</pre></div>',
+            //  -- output --
             '<div>\n' +
             '    <pre>var a=1;\n' +
             'var b=a;</pre>\n' +
             '</div>');
         test_fragment(
-            '<div><pre>\nvar a=1;\nvar b=a;\n</pre></div>',
+            '<div><pre>\n' +
+            'var a=1;\n' +
+            'var b=a;\n' +
+            '</pre></div>',
+            //  -- output --
             '<div>\n' +
             '    <pre>\n' +
             'var a=1;\n' +
diff --git a/js/test/generated/beautify-javascript-tests.js b/js/test/generated/beautify-javascript-tests.js
index 1a0b39f87..f36128e5d 100644
--- a/js/test/generated/beautify-javascript-tests.js
+++ b/js/test/generated/beautify-javascript-tests.js
@@ -307,10 +307,22 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         // Test template and continuation strings
         reset_options();
         bt('`This is a ${template} string.`');
-        bt('`This\n  is\n  a\n  ${template}\n  string.`');
-        bt('a = `This is a continuation\\nstring.`');
-        bt('a = "This is a continuation\\nstring."');
-        bt('`SELECT\n  nextval(\'${this.options.schema ? `${this.options.schema}.` : \'\'}"${this.tableName}_${this.autoIncrementField}_seq"\'::regclass\n  ) nextval;`');
+        bt(
+            '`This\n' +
+            '  is\n' +
+            '  a\n' +
+            '  ${template}\n' +
+            '  string.`');
+        bt(
+            'a = `This is a continuation\\\n' +
+            'string.`');
+        bt(
+            'a = "This is a continuation\\\n' +
+            'string."');
+        bt(
+            '`SELECT\n' +
+            '  nextval(\'${this.options.schema ? `${this.options.schema}.` : \'\'}"${this.tableName}_${this.autoIncrementField}_seq"\'::regclass\n' +
+            '  ) nextval;`');
         
         // Tests for #1030
         bt(
@@ -353,7 +365,11 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         reset_options();
         opts.brace_style = "collapse,preserve-inline";
         bt('const m = { ...item, c: 3 };');
-        bt('const m = {\n    ...item,\n    c: 3\n};');
+        bt(
+            'const m = {\n' +
+            '    ...item,\n' +
+            '    c: 3\n' +
+            '};');
         bt('const m = { c: 3, ...item };');
         bt('const m = [...item, 3];');
         bt('const m = [3, ...item];');
@@ -362,7 +378,12 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         //============================================================
         // Object literal shorthand functions
         reset_options();
-        bt('return {\n    foo() {\n        return 42;\n    }\n}');
+        bt(
+            'return {\n' +
+            '    foo() {\n' +
+            '        return 42;\n' +
+            '    }\n' +
+            '}');
         bt(
             'var foo = {\n' +
             '    * bar() {\n' +
@@ -371,6 +392,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '};');
         bt(
             'var foo = {bar(){return 42;},*barGen(){yield 42;}};',
+            //  -- output --
             'var foo = {\n' +
             '    bar() {\n' +
             '        return 42;\n' +
@@ -409,7 +431,15 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.end_with_newline = true;
         test_fragment('', '\n');
         test_fragment('   return .5', '   return .5\n');
-        test_fragment('   \n\nreturn .5\n\n\n\n', '   return .5\n');
+        test_fragment(
+            '   \n' +
+            '\n' +
+            'return .5\n' +
+            '\n' +
+            '\n' +
+            '\n',
+            //  -- output --
+            '   return .5\n');
         test_fragment('\n');
 
         // End With Newline - (eof = "")
@@ -417,7 +447,15 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.end_with_newline = false;
         test_fragment('');
         test_fragment('   return .5');
-        test_fragment('   \n\nreturn .5\n\n\n\n', '   return .5');
+        test_fragment(
+            '   \n' +
+            '\n' +
+            'return .5\n' +
+            '\n' +
+            '\n' +
+            '\n',
+            //  -- output --
+            '   return .5');
         test_fragment('\n', '');
 
 
@@ -455,32 +493,88 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         // Brace style permutations - (ibo = "", iao = "", ibc = "", iac = "", obo = " ", oao = " ", obc = " ", oac = " ")
         reset_options();
         opts.brace_style = 'collapse,preserve-inline';
-        bt('var a ={a: 2};\nvar a ={a: 2};', 'var a = { a: 2 };\nvar a = { a: 2 };');
-        bt('//case 1\nif (a == 1){}\n//case 2\nelse if (a == 2){}', '//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}');
+        bt(
+            'var a ={a: 2};\n' +
+            'var a ={a: 2};',
+            //  -- output --
+            'var a = { a: 2 };\n' +
+            'var a = { a: 2 };');
+        bt(
+            '//case 1\n' +
+            'if (a == 1){}\n' +
+            '//case 2\n' +
+            'else if (a == 2){}',
+            //  -- output --
+            '//case 1\n' +
+            'if (a == 1) {}\n' +
+            '//case 2\n' +
+            'else if (a == 2) {}');
         bt('if(1){2}else{3}', 'if (1) { 2 } else { 3 }');
         bt('try{a();}catch(b){c();}catch(d){}finally{e();}', 'try { a(); } catch (b) { c(); } catch (d) {} finally { e(); }');
 
         // Brace style permutations - (ibo = "\n", iao = "\n", ibc = "\n", iac = "\n", obo = " ", oao = "\n    ", obc = "\n", oac = " ")
         reset_options();
         opts.brace_style = 'collapse,preserve-inline';
-        bt('var a =\n{\na: 2\n}\n;\nvar a =\n{\na: 2\n}\n;', 'var a = {\n    a: 2\n};\nvar a = {\n    a: 2\n};');
-        bt('//case 1\nif (a == 1)\n{}\n//case 2\nelse if (a == 2)\n{}', '//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}');
+        bt(
+            'var a =\n{\na: 2\n}\n;\n' +
+            'var a =\n{\na: 2\n}\n;',
+            //  -- output --
+            'var a = {\n    a: 2\n};\n' +
+            'var a = {\n    a: 2\n};');
+        bt(
+            '//case 1\n' +
+            'if (a == 1)\n{}\n' +
+            '//case 2\n' +
+            'else if (a == 2)\n{}',
+            //  -- output --
+            '//case 1\n' +
+            'if (a == 1) {}\n' +
+            '//case 2\n' +
+            'else if (a == 2) {}');
         bt('if(1)\n{\n2\n}\nelse\n{\n3\n}', 'if (1) {\n    2\n} else {\n    3\n}');
         bt('try\n{\na();\n}\ncatch(b)\n{\nc();\n}\ncatch(d)\n{}\nfinally\n{\ne();\n}', 'try {\n    a();\n} catch (b) {\n    c();\n} catch (d) {} finally {\n    e();\n}');
 
         // Brace style permutations - (ibo = "", iao = "", ibc = "", iac = "", obo = " ", oao = "\n    ", obc = "\n", oac = " ")
         reset_options();
         opts.brace_style = 'collapse';
-        bt('var a ={a: 2};\nvar a ={a: 2};', 'var a = {\n    a: 2\n};\nvar a = {\n    a: 2\n};');
-        bt('//case 1\nif (a == 1){}\n//case 2\nelse if (a == 2){}', '//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}');
+        bt(
+            'var a ={a: 2};\n' +
+            'var a ={a: 2};',
+            //  -- output --
+            'var a = {\n    a: 2\n};\n' +
+            'var a = {\n    a: 2\n};');
+        bt(
+            '//case 1\n' +
+            'if (a == 1){}\n' +
+            '//case 2\n' +
+            'else if (a == 2){}',
+            //  -- output --
+            '//case 1\n' +
+            'if (a == 1) {}\n' +
+            '//case 2\n' +
+            'else if (a == 2) {}');
         bt('if(1){2}else{3}', 'if (1) {\n    2\n} else {\n    3\n}');
         bt('try{a();}catch(b){c();}catch(d){}finally{e();}', 'try {\n    a();\n} catch (b) {\n    c();\n} catch (d) {} finally {\n    e();\n}');
 
         // Brace style permutations - (ibo = "\n", iao = "\n", ibc = "\n", iac = "\n", obo = " ", oao = "\n    ", obc = "\n", oac = " ")
         reset_options();
         opts.brace_style = 'collapse';
-        bt('var a =\n{\na: 2\n}\n;\nvar a =\n{\na: 2\n}\n;', 'var a = {\n    a: 2\n};\nvar a = {\n    a: 2\n};');
-        bt('//case 1\nif (a == 1)\n{}\n//case 2\nelse if (a == 2)\n{}', '//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}');
+        bt(
+            'var a =\n{\na: 2\n}\n;\n' +
+            'var a =\n{\na: 2\n}\n;',
+            //  -- output --
+            'var a = {\n    a: 2\n};\n' +
+            'var a = {\n    a: 2\n};');
+        bt(
+            '//case 1\n' +
+            'if (a == 1)\n{}\n' +
+            '//case 2\n' +
+            'else if (a == 2)\n{}',
+            //  -- output --
+            '//case 1\n' +
+            'if (a == 1) {}\n' +
+            '//case 2\n' +
+            'else if (a == 2) {}');
         bt('if(1)\n{\n2\n}\nelse\n{\n3\n}', 'if (1) {\n    2\n} else {\n    3\n}');
         bt('try\n{\na();\n}\ncatch(b)\n{\nc();\n}\ncatch(d)\n{}\nfinally\n{\ne();\n}', 'try {\n    a();\n} catch (b) {\n    c();\n} catch (d) {} finally {\n    e();\n}');
 
@@ -489,26 +583,88 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         // Comma-first option - (c0 = ",\n", c1 = ",\n    ", c2 = ",\n        ", c3 = ",\n            ", f1 = "    ,\n    ")
         reset_options();
         opts.comma_first = false;
-        bt('{a:1, b:2}', '{\n    a: 1,\n    b: 2\n}');
+        bt(
+            '{a:1, b:2}',
+            //  -- output --
+            '{\n' +
+            '    a: 1,\n    b: 2\n' +
+            '}');
         bt('var a=1, b=c[d], e=6;', 'var a = 1,\n    b = c[d],\n    e = 6;');
-        bt('for(var a=1,b=2,c=3;d<3;d++)\ne', 'for (var a = 1, b = 2, c = 3; d < 3; d++)\n    e');
-        bt('for(var a=1,b=2,\nc=3;d<3;d++)\ne', 'for (var a = 1, b = 2,\n        c = 3; d < 3; d++)\n    e');
-        bt('function foo() {\n    return [\n        "one",\n        "two"\n    ];\n}');
-        bt('a=[[1,2],[4,5],[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    [7, 8]\n]');
-        bt('a=[[1,2],[4,5],[7,8],]', 'a = [\n    [1, 2],\n    [4, 5],\n    [7, 8],\n]');
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]');
-        bt('a=[[1,2],[4,5],function(){},function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    function() {},\n    [7, 8]\n]');
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]');
+        bt(
+            'for(var a=1,b=2,c=3;d<3;d++)\n' +
+            'e',
+            //  -- output --
+            'for (var a = 1, b = 2, c = 3; d < 3; d++)\n' +
+            '    e');
+        bt(
+            'for(var a=1,b=2,\n' +
+            'c=3;d<3;d++)\n' +
+            'e',
+            //  -- output --
+            'for (var a = 1, b = 2,\n        c = 3; d < 3; d++)\n' +
+            '    e');
+        bt(
+            'function foo() {\n' +
+            '    return [\n' +
+            '        "one",\n        "two"\n' +
+            '    ];\n' +
+            '}');
+        bt(
+            'a=[[1,2],[4,5],[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],[7,8],]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    [7, 8],\n]');
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],function(){},function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    function() {},\n    function() {},\n    [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n' +
+            ']');
         bt('a=[b,c,function(){},function(){},d]', 'a = [b, c, function() {}, function() {}, d]');
-        bt('a=[b,c,\nfunction(){},function(){},d]', 'a = [b, c,\n    function() {},\n    function() {},\n    d\n]');
+        bt(
+            'a=[b,c,\n' +
+            'function(){},function(){},d]',
+            //  -- output --
+            'a = [b, c,\n    function() {},\n    function() {},\n    d\n' +
+            ']');
         bt('a=[a[1],b[4],c[d[7]]]', 'a = [a[1], b[4], c[d[7]]]');
         bt('[1,2,[3,4,[5,6],7],8]', '[1, 2, [3, 4, [5, 6], 7], 8]');
-        bt('[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]', '[\n    [\n        ["1", "2"],\n        ["3", "4"]\n    ],\n    [\n        ["5", "6", "7"],\n        ["8", "9", "0"]\n    ],\n    [\n        ["1", "2", "3"],\n        ["4", "5", "6", "7"],\n        ["8", "9", "0"]\n    ]\n]');
+        bt(
+            '[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]',
+            //  -- output --
+            '[\n' +
+            '    [\n' +
+            '        ["1", "2"],\n        ["3", "4"]\n' +
+            '    ],\n    [\n' +
+            '        ["5", "6", "7"],\n        ["8", "9", "0"]\n' +
+            '    ],\n    [\n' +
+            '        ["1", "2", "3"],\n        ["4", "5", "6", "7"],\n        ["8", "9", "0"]\n' +
+            '    ]\n' +
+            ']');
         bt(
             'changeCollection.add({\n' +
             '    name: "Jonathan" // New line inserted after this line on every save\n' +
             '    , age: 25\n' +
             '});',
+            //  -- output --
             'changeCollection.add({\n' +
             '    name: "Jonathan" // New line inserted after this line on every save\n' +
             '        ,\n    age: 25\n' +
@@ -522,6 +678,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        return true;\n' +
             '    }\n' +
             ');',
+            //  -- output --
             'changeCollection.add(\n' +
             '    function() {\n' +
             '        return true;\n' +
@@ -533,21 +690,82 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         // Comma-first option - (c0 = "\n, ", c1 = "\n    , ", c2 = "\n        , ", c3 = "\n            , ", f1 = ", ")
         reset_options();
         opts.comma_first = true;
-        bt('{a:1, b:2}', '{\n    a: 1\n    , b: 2\n}');
+        bt(
+            '{a:1, b:2}',
+            //  -- output --
+            '{\n' +
+            '    a: 1\n    , b: 2\n' +
+            '}');
         bt('var a=1, b=c[d], e=6;', 'var a = 1\n    , b = c[d]\n    , e = 6;');
-        bt('for(var a=1,b=2,c=3;d<3;d++)\ne', 'for (var a = 1, b = 2, c = 3; d < 3; d++)\n    e');
-        bt('for(var a=1,b=2,\nc=3;d<3;d++)\ne', 'for (var a = 1, b = 2\n        , c = 3; d < 3; d++)\n    e');
-        bt('function foo() {\n    return [\n        "one"\n        , "two"\n    ];\n}');
-        bt('a=[[1,2],[4,5],[7,8]]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , [7, 8]\n]');
-        bt('a=[[1,2],[4,5],[7,8],]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , [7, 8]\n, ]');
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , function() {}\n    , [7, 8]\n]');
-        bt('a=[[1,2],[4,5],function(){},function(){},[7,8]]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , function() {}\n    , function() {}\n    , [7, 8]\n]');
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , function() {}\n    , [7, 8]\n]');
+        bt(
+            'for(var a=1,b=2,c=3;d<3;d++)\n' +
+            'e',
+            //  -- output --
+            'for (var a = 1, b = 2, c = 3; d < 3; d++)\n' +
+            '    e');
+        bt(
+            'for(var a=1,b=2,\n' +
+            'c=3;d<3;d++)\n' +
+            'e',
+            //  -- output --
+            'for (var a = 1, b = 2\n        , c = 3; d < 3; d++)\n' +
+            '    e');
+        bt(
+            'function foo() {\n' +
+            '    return [\n' +
+            '        "one"\n        , "two"\n' +
+            '    ];\n' +
+            '}');
+        bt(
+            'a=[[1,2],[4,5],[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],[7,8],]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , [7, 8]\n, ]');
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , function() {}\n    , [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],function(){},function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , function() {}\n    , function() {}\n    , [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , function() {}\n    , [7, 8]\n' +
+            ']');
         bt('a=[b,c,function(){},function(){},d]', 'a = [b, c, function() {}, function() {}, d]');
-        bt('a=[b,c,\nfunction(){},function(){},d]', 'a = [b, c\n    , function() {}\n    , function() {}\n    , d\n]');
+        bt(
+            'a=[b,c,\n' +
+            'function(){},function(){},d]',
+            //  -- output --
+            'a = [b, c\n    , function() {}\n    , function() {}\n    , d\n' +
+            ']');
         bt('a=[a[1],b[4],c[d[7]]]', 'a = [a[1], b[4], c[d[7]]]');
         bt('[1,2,[3,4,[5,6],7],8]', '[1, 2, [3, 4, [5, 6], 7], 8]');
-        bt('[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]', '[\n    [\n        ["1", "2"]\n        , ["3", "4"]\n    ]\n    , [\n        ["5", "6", "7"]\n        , ["8", "9", "0"]\n    ]\n    , [\n        ["1", "2", "3"]\n        , ["4", "5", "6", "7"]\n        , ["8", "9", "0"]\n    ]\n]');
+        bt(
+            '[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]',
+            //  -- output --
+            '[\n' +
+            '    [\n' +
+            '        ["1", "2"]\n        , ["3", "4"]\n' +
+            '    ]\n    , [\n' +
+            '        ["5", "6", "7"]\n        , ["8", "9", "0"]\n' +
+            '    ]\n    , [\n' +
+            '        ["1", "2", "3"]\n        , ["4", "5", "6", "7"]\n        , ["8", "9", "0"]\n' +
+            '    ]\n' +
+            ']');
         bt(
             'changeCollection.add({\n' +
             '    name: "Jonathan" // New line inserted after this line on every save\n' +
@@ -562,6 +780,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        return true;\n' +
             '    }\n' +
             ');',
+            //  -- output --
             'changeCollection.add(\n' +
             '    function() {\n' +
             '        return true;\n' +
@@ -577,9 +796,28 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.space_in_paren = false;
         opts.space_in_empty_paren = false;
         bt('if(p) foo(a,b);', 'if (p) foo(a, b);');
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }', 'try {\n    while (true) {\n        willThrow()\n    }\n} catch (result) switch (result) {\n    case 1:\n        ++result\n}');
+        bt(
+            'try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
+            //  -- output --
+            'try {\n' +
+            '    while (true) {\n' +
+            '        willThrow()\n' +
+            '    }\n' +
+            '} catch (result) switch (result) {\n' +
+            '    case 1:\n' +
+            '        ++result\n' +
+            '}');
         bt('((e/((a+(b)*c)-d))^2)*5;', '((e / ((a + (b) * c) - d)) ^ 2) * 5;');
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}', 'function f(a, b) {\n    if (a) b()\n}\n\nfunction g(a, b) {\n    if (!a) b()\n}');
+        bt(
+            'function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
+            //  -- output --
+            'function f(a, b) {\n' +
+            '    if (a) b()\n' +
+            '}\n' +
+            '\n' +
+            'function g(a, b) {\n' +
+            '    if (!a) b()\n' +
+            '}');
         bt('a=[];', 'a = [];');
         bt('a=[b,c,d];', 'a = [b, c, d];');
         bt('a= f[b];', 'a = f[b];');
@@ -592,6 +830,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        dest: "www/gui/build"\n' +
             '    } ]\n' +
             '}',
+            //  -- output --
             '{\n' +
             '    files: [{\n' +
             '        expand: true,\n' +
@@ -606,9 +845,28 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.space_in_paren = false;
         opts.space_in_empty_paren = true;
         bt('if(p) foo(a,b);', 'if (p) foo(a, b);');
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }', 'try {\n    while (true) {\n        willThrow()\n    }\n} catch (result) switch (result) {\n    case 1:\n        ++result\n}');
+        bt(
+            'try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
+            //  -- output --
+            'try {\n' +
+            '    while (true) {\n' +
+            '        willThrow()\n' +
+            '    }\n' +
+            '} catch (result) switch (result) {\n' +
+            '    case 1:\n' +
+            '        ++result\n' +
+            '}');
         bt('((e/((a+(b)*c)-d))^2)*5;', '((e / ((a + (b) * c) - d)) ^ 2) * 5;');
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}', 'function f(a, b) {\n    if (a) b()\n}\n\nfunction g(a, b) {\n    if (!a) b()\n}');
+        bt(
+            'function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
+            //  -- output --
+            'function f(a, b) {\n' +
+            '    if (a) b()\n' +
+            '}\n' +
+            '\n' +
+            'function g(a, b) {\n' +
+            '    if (!a) b()\n' +
+            '}');
         bt('a=[];', 'a = [];');
         bt('a=[b,c,d];', 'a = [b, c, d];');
         bt('a= f[b];', 'a = f[b];');
@@ -621,6 +879,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        dest: "www/gui/build"\n' +
             '    } ]\n' +
             '}',
+            //  -- output --
             '{\n' +
             '    files: [{\n' +
             '        expand: true,\n' +
@@ -635,9 +894,28 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.space_in_paren = true;
         opts.space_in_empty_paren = false;
         bt('if(p) foo(a,b);', 'if ( p ) foo( a, b );');
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }', 'try {\n    while ( true ) {\n        willThrow()\n    }\n} catch ( result ) switch ( result ) {\n    case 1:\n        ++result\n}');
+        bt(
+            'try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
+            //  -- output --
+            'try {\n' +
+            '    while ( true ) {\n' +
+            '        willThrow()\n' +
+            '    }\n' +
+            '} catch ( result ) switch ( result ) {\n' +
+            '    case 1:\n' +
+            '        ++result\n' +
+            '}');
         bt('((e/((a+(b)*c)-d))^2)*5;', '( ( e / ( ( a + ( b ) * c ) - d ) ) ^ 2 ) * 5;');
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}', 'function f( a, b ) {\n    if ( a ) b()\n}\n\nfunction g( a, b ) {\n    if ( !a ) b()\n}');
+        bt(
+            'function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
+            //  -- output --
+            'function f( a, b ) {\n' +
+            '    if ( a ) b()\n' +
+            '}\n' +
+            '\n' +
+            'function g( a, b ) {\n' +
+            '    if ( !a ) b()\n' +
+            '}');
         bt('a=[];', 'a = [];');
         bt('a=[b,c,d];', 'a = [ b, c, d ];');
         bt('a= f[b];', 'a = f[ b ];');
@@ -656,9 +934,28 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.space_in_paren = true;
         opts.space_in_empty_paren = true;
         bt('if(p) foo(a,b);', 'if ( p ) foo( a, b );');
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }', 'try {\n    while ( true ) {\n        willThrow( )\n    }\n} catch ( result ) switch ( result ) {\n    case 1:\n        ++result\n}');
+        bt(
+            'try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
+            //  -- output --
+            'try {\n' +
+            '    while ( true ) {\n' +
+            '        willThrow( )\n' +
+            '    }\n' +
+            '} catch ( result ) switch ( result ) {\n' +
+            '    case 1:\n' +
+            '        ++result\n' +
+            '}');
         bt('((e/((a+(b)*c)-d))^2)*5;', '( ( e / ( ( a + ( b ) * c ) - d ) ) ^ 2 ) * 5;');
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}', 'function f( a, b ) {\n    if ( a ) b( )\n}\n\nfunction g( a, b ) {\n    if ( !a ) b( )\n}');
+        bt(
+            'function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
+            //  -- output --
+            'function f( a, b ) {\n' +
+            '    if ( a ) b( )\n' +
+            '}\n' +
+            '\n' +
+            'function g( a, b ) {\n' +
+            '    if ( !a ) b( )\n' +
+            '}');
         bt('a=[];', 'a = [ ];');
         bt('a=[b,c,d];', 'a = [ b, c, d ];');
         bt('a= f[b];', 'a = f[ b ];');
@@ -715,6 +1012,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            //  -- output --
             'var res = a + b - c / d * e % f;\n' +
             'var res = g & h | i ^ j;\n' +
             'var res = (k && l || m) ? n : o;\n' +
@@ -763,6 +1061,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            //  -- output --
             'var res = a + b - c / d * e % f;\n' +
             'var res = g & h | i ^ j;\n' +
             'var res = (k && l || m) ? n : o;\n' +
@@ -811,6 +1110,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            //  -- output --
             'var res = a + b - c / d * e % f;\n' +
             'var res = g & h | i ^ j;\n' +
             'var res = (k && l || m) ? n : o;\n' +
@@ -854,6 +1154,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            //  -- output --
             'var res = a + b -\n' +
             '    c /\n' +
             '    d * e %\n' +
@@ -894,6 +1195,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             ': h;\n' +
             'var i = j ? k :\n' +
             'l;',
+            //  -- output --
             'var a = {\n' +
             '    b: bval,\n' +
             '    c: cval,\n' +
@@ -921,6 +1223,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        anOcean\n' +
             '        || aRiver);\n' +
             '}',
+            //  -- output --
             'var d = 1;\n' +
             'if (a === b &&\n' +
             '    c) {\n' +
@@ -974,6 +1277,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            //  -- output --
             'var res = a + b\n' +
             '    - c\n' +
             '    / d * e\n' +
@@ -1013,6 +1317,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             ': h;\n' +
             'var i = j ? k :\n' +
             'l;',
+            //  -- output --
             'var a = {\n' +
             '    b: bval,\n' +
             '    c: cval,\n' +
@@ -1040,6 +1345,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        anOcean\n' +
             '        || aRiver);\n' +
             '}',
+            //  -- output --
             'var d = 1;\n' +
             'if (a === b\n' +
             '    && c) {\n' +
@@ -1093,6 +1399,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            //  -- output --
             'var res = a + b\n' +
             '    - c /\n' +
             '    d * e\n' +
@@ -1134,6 +1441,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             ': h;\n' +
             'var i = j ? k :\n' +
             'l;',
+            //  -- output --
             'var a = {\n' +
             '    b: bval,\n' +
             '    c: cval,\n' +
@@ -1183,15 +1491,26 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         reset_options();
         bt('async function foo() {}');
         bt('let w = async function foo() {}');
-        bt('async function foo() {}\nvar x = await foo();');
+        bt(
+            'async function foo() {}\n' +
+            'var x = await foo();');
         
         // async function as an input to another function
         bt('wrapper(async function foo() {})');
         
         // await on inline anonymous function. should have a space after await
         bt(
-            'async function() {\n    var w = await(async function() {\n        return await foo();\n    })();\n}',
-            'async function() {\n    var w = await (async function() {\n        return await foo();\n    })();\n}');
+            'async function() {\n' +
+            '    var w = await(async function() {\n' +
+            '        return await foo();\n' +
+            '    })();\n' +
+            '}',
+            //  -- output --
+            'async function() {\n' +
+            '    var w = await (async function() {\n' +
+            '        return await foo();\n' +
+            '    })();\n' +
+            '}');
         
         // ensure that this doesn't break anyone with the async library
         bt('async.map(function(t) {})');
@@ -1201,7 +1520,12 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         // e4x - Test that e4x literals passed through when e4x-option is enabled
         reset_options();
         opts.e4x = true;
-        bt('xml=<a b="c"><d/><e>\n foo</e>x</a>;', 'xml = <a b="c"><d/><e>\n foo</e>x</a>;');
+        bt(
+            'xml=<a b="c"><d/><e>\n' +
+            ' foo</e>x</a>;',
+            //  -- output --
+            'xml = <a b="c"><d/><e>\n' +
+            ' foo</e>x</a>;');
         bt('<a b=\'This is a quoted "c".\'/>');
         bt('<a b="This is a quoted \'c\'."/>');
         bt('<a b="A quote \' inside string."/>');
@@ -1209,8 +1533,20 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         bt('<a b=\'Some """ quotes ""  inside string.\'/>');
         
         // Handles inline expressions
-        bt('xml=<{a} b="c"><d/><e v={z}>\n foo</e>x</{a}>;', 'xml = <{a} b="c"><d/><e v={z}>\n foo</e>x</{a}>;');
-        bt('xml=<{a} b="c">\n    <e v={z}>\n foo</e>x</{a}>;', 'xml = <{a} b="c">\n    <e v={z}>\n foo</e>x</{a}>;');
+        bt(
+            'xml=<{a} b="c"><d/><e v={z}>\n' +
+            ' foo</e>x</{a}>;',
+            //  -- output --
+            'xml = <{a} b="c"><d/><e v={z}>\n' +
+            ' foo</e>x</{a}>;');
+        bt(
+            'xml=<{a} b="c">\n' +
+            '    <e v={z}>\n' +
+            ' foo</e>x</{a}>;',
+            //  -- output --
+            'xml = <{a} b="c">\n' +
+            '    <e v={z}>\n' +
+            ' foo</e>x</{a}>;');
         
         // xml literals with special characters in elem names - see http://www.w3.org/TR/REC-xml/#NT-NameChar
         bt('xml = <_:.valid.xml- _:.valid.xml-="123"/>;');
@@ -1219,7 +1555,12 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         bt('xml = <elem someAttr/>;');
         
         // Handles CDATA
-        bt('xml=<![CDATA[ b="c"><d/><e v={z}>\n foo</e>x/]]>;', 'xml = <![CDATA[ b="c"><d/><e v={z}>\n foo</e>x/]]>;');
+        bt(
+            'xml=<![CDATA[ b="c"><d/><e v={z}>\n' +
+            ' foo</e>x/]]>;',
+            //  -- output --
+            'xml = <![CDATA[ b="c"><d/><e v={z}>\n' +
+            ' foo</e>x/]]>;');
         bt('xml=<![CDATA[]]>;', 'xml = <![CDATA[]]>;');
         bt('xml=<a b="c"><![CDATA[d/></a></{}]]></a>;', 'xml = <a b="c"><![CDATA[d/></a></{}]]></a>;');
         
@@ -1373,6 +1714,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    }\n' +
             '});\n' +
             'React.render(<MarkdownEditor />, mountNode);',
+            //  -- output --
             'var converter = new Showdown.converter();\n' +
             'var MarkdownEditor = React.createClass({\n' +
             '    getInitialState: function() {\n' +
@@ -1420,6 +1762,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    );\n' +
             'var qwer = <DropDown> A dropdown list <Menu> <MenuItem>Do Something</MenuItem> <MenuItem>Do Something Fun!</MenuItem> <MenuItem>Do Something Else</MenuItem> </Menu> </DropDown>;\n' +
             'render(dropdown);',
+            //  -- output --
             'var content = (\n' +
             '    <Nav>\n' +
             '            {/* child comment, put {} around */}\n' +
@@ -1440,13 +1783,17 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         // as long as nesting matches.
         bt(
             'xml=<a x="jn"><c></b></f><a><d jnj="jnn"><f></a ></nj></a>;',
+            //  -- output --
             'xml = <a x="jn"><c></b></f><a><d jnj="jnn"><f></a ></nj></a>;');
         
         // If xml is not terminated, the remainder of the file is treated
         // as part of the xml-literal (passed through unaltered)
         test_fragment(
-            'xml=<a></b>\nc<b;',
-            'xml = <a></b>\nc<b;');
+            'xml=<a></b>\n' +
+            'c<b;',
+            //  -- output --
+            'xml = <a></b>\n' +
+            'c<b;');
         
         // Issue #646 = whitespace is allowed in attribute declarations
         bt(
@@ -1527,6 +1874,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '       {children}\n' +
             '    </{a + b}>\n' +
             '    );',
+            //  -- output --
             'return (\n' +
             '    <{\n' +
             '        a + b\n' +
@@ -1545,29 +1893,61 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         reset_options();
         opts.e4x = false;
         bt(
-            'xml=<a b="c"><d/><e>\n foo</e>x</a>;',
-            'xml = < a b = "c" > < d / > < e >\n    foo < /e>x</a > ;');
+            'xml=<a b="c"><d/><e>\n' +
+            ' foo</e>x</a>;',
+            //  -- output --
+            'xml = < a b = "c" > < d / > < e >\n' +
+            '    foo < /e>x</a > ;');
 
 
         //============================================================
         // Multiple braces
         reset_options();
-        bt('{{}/z/}', '{\n    {}\n    /z/\n}');
+        bt(
+            '{{}/z/}',
+            //  -- output --
+            '{\n' +
+            '    {}\n' +
+            '    /z/\n' +
+            '}');
 
 
         //============================================================
         // Beautify preserve formatting
         reset_options();
-        bt('/* beautify preserve:start */\n/* beautify preserve:end */');
-        bt('/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */');
-        bt('var a = 1;\n/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */');
-        bt('/* beautify preserve:start */     {asdklgh;y;;{}dd2d}/* beautify preserve:end */');
         bt(
-            'var a =  1;\n/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */',
-            'var a = 1;\n/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */');
+            '/* beautify preserve:start */\n' +
+            '/* beautify preserve:end */');
+        bt(
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */');
+        bt(
+            'var a = 1;\n' +
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */');
+        bt('/* beautify preserve:start */     {asdklgh;y;;{}dd2d}/* beautify preserve:end */');
         bt(
-            'var a = 1;\n /* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */',
-            'var a = 1;\n/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */');
+            'var a =  1;\n' +
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */',
+            //  -- output --
+            'var a = 1;\n' +
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */');
+        bt(
+            'var a = 1;\n' +
+            ' /* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */',
+            //  -- output --
+            'var a = 1;\n' +
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */');
         bt(
             'var a = {\n' +
             '    /* beautify preserve:start */\n' +
@@ -1586,6 +1966,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    ten   : 10\n' +
             '/* beautify preserve:end */\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /* beautify preserve:start */\n' +
             '    one   :  1,\n' +
@@ -1604,6 +1985,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    three :  3,\n' +
             '    ten   : 10\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /*  beautify preserve:start  */\n' +
             '    one: 1,\n' +
@@ -1619,6 +2001,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    three :  3,\n' +
             '    ten   : 10\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /*beautify preserve:start*/\n' +
             '    one: 1,\n' +
@@ -1634,6 +2017,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    three :  3,\n' +
             '    ten   : 10\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /*beautify  preserve:start*/\n' +
             '    one: 1,\n' +
@@ -1643,16 +2027,39 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '};');
         
         // Directive: ignore
-        bt('/* beautify ignore:start */\n/* beautify ignore:end */');
-        bt('/* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */');
-        bt('var a = 1;\n/* beautify ignore:start */\n   var a = 1;\n/* beautify ignore:end */');
-        bt('/* beautify ignore:start */     {asdklgh;y;+++;dd2d}/* beautify ignore:end */');
         bt(
-            'var a =  1;\n/* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */',
-            'var a = 1;\n/* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */');
+            '/* beautify ignore:start */\n' +
+            '/* beautify ignore:end */');
+        bt(
+            '/* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */');
+        bt(
+            'var a = 1;\n' +
+            '/* beautify ignore:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify ignore:end */');
+        bt('/* beautify ignore:start */     {asdklgh;y;+++;dd2d}/* beautify ignore:end */');
         bt(
-            'var a = 1;\n /* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */',
-            'var a = 1;\n/* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */');
+            'var a =  1;\n' +
+            '/* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */',
+            //  -- output --
+            'var a = 1;\n' +
+            '/* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */');
+        bt(
+            'var a = 1;\n' +
+            ' /* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */',
+            //  -- output --
+            'var a = 1;\n' +
+            '/* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */');
         bt(
             'var a = {\n' +
             '    /* beautify ignore:start */\n' +
@@ -1671,6 +2078,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    ten   : 10\n' +
             '/* beautify ignore:end */\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start */\n' +
             '    one   :  1\n' +
@@ -1693,6 +2101,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    ten   : 10\n' +
             '/* beautify preserve:end */\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /* beautify preserve:start */\n' +
             '/* beautify preserve:start */\n' +
@@ -1715,6 +2124,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    ten   : 10\n' +
             '/* beautify ignore:end */\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start */\n' +
             '    one   :  1\n' +
@@ -1741,6 +2151,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    ==The next comment ends the starting ignore==\n' +
             '/* beautify ignore:end */\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start */\n' +
             '    one   :  1\n' +
@@ -1766,6 +2177,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    ten   : 10\n' +
             '   // This is all preserved\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start preserve:start */\n' +
             '    one   :  {\n' +
@@ -1790,6 +2202,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '/* beautify preserve:end */\n' +
             '     eleven: 11\n' +
             '};',
+            //  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start preserve:start */\n' +
             '    one   :  {\n' +
@@ -1909,33 +2322,91 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.space_after_anon_function = true;
         bt(
             'a=typeof(x)',
+            //  -- output --
             'a = typeof (x)');
         bt(
-            'x();\n\nfunction(){}',
-            'x();\n\nfunction () {}');
+            'x();\n' +
+            '\n' +
+            'function(){}',
+            //  -- output --
+            'x();\n' +
+            '\n' +
+            'function () {}');
         bt(
-            'x();\n\nvar x = {\nx: function(){}\n}',
-            'x();\n\nvar x = {\n    x: function () {}\n}');
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            'x: function(){}\n' +
+            '}',
+            //  -- output --
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            '    x: function () {}\n' +
+            '}');
         bt(
-            'function () {\n    var a, b, c, d, e = [],\n        f;\n}');
+            'function () {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}');
         bt(
             'switch(x) {case 0: case 1: a(); break; default: break}',
-            'switch (x) {\ncase 0:\ncase 1:\n    a();\n    break;\ndefault:\n    break\n}');
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\ncase -1:\n    break;\ncase !y:\n    break;\n}');
+            //  -- output --
+            'switch (x) {\n' +
+            'case 0:\n' +
+            'case 1:\n' +
+            '    a();\n' +
+            '    break;\n' +
+            'default:\n' +
+            '    break\n' +
+            '}');
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            //  -- output --
+            'switch (x) {\n' +
+            'case -1:\n' +
+            '    break;\n' +
+            'case !y:\n' +
+            '    break;\n' +
+            '}');
         
         // typical greasemonkey start
-        test_fragment('// comment 2\n(function ()');
+        test_fragment(
+            '// comment 2\n' +
+            '(function ()');
         bt(
             'var a2, b2, c2, d2 = 0, c = function() {}, d = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';');
-        bt(
-            'var a2, b2, c2, d2 = 0, c = function() {},\nd = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';');
+            //  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';');
+        bt(
+            'var a2, b2, c2, d2 = 0, c = function() {},\n' +
+            'd = \'\';',
+            //  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';');
         bt(
             'var o2=$.extend(a);function(){alert(x);}',
-            'var o2 = $.extend(a);\n\nfunction () {\n    alert(x);\n}');
-        bt('function*() {\n    yield 1;\n}', 'function* () {\n    yield 1;\n}');
-        bt('function* x() {\n    yield 1;\n}');
+            //  -- output --
+            'var o2 = $.extend(a);\n' +
+            '\n' +
+            'function () {\n' +
+            '    alert(x);\n' +
+            '}');
+        bt(
+            'function*() {\n' +
+            '    yield 1;\n' +
+            '}',
+            //  -- output --
+            'function* () {\n' +
+            '    yield 1;\n' +
+            '}');
+        bt(
+            'function* x() {\n' +
+            '    yield 1;\n' +
+            '}');
 
         // jslint and space after anon function - (f = " ", c = "")
         reset_options();
@@ -1943,33 +2414,91 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.space_after_anon_function = false;
         bt(
             'a=typeof(x)',
+            //  -- output --
             'a = typeof (x)');
         bt(
-            'x();\n\nfunction(){}',
-            'x();\n\nfunction () {}');
+            'x();\n' +
+            '\n' +
+            'function(){}',
+            //  -- output --
+            'x();\n' +
+            '\n' +
+            'function () {}');
         bt(
-            'x();\n\nvar x = {\nx: function(){}\n}',
-            'x();\n\nvar x = {\n    x: function () {}\n}');
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            'x: function(){}\n' +
+            '}',
+            //  -- output --
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            '    x: function () {}\n' +
+            '}');
         bt(
-            'function () {\n    var a, b, c, d, e = [],\n        f;\n}');
+            'function () {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}');
         bt(
             'switch(x) {case 0: case 1: a(); break; default: break}',
-            'switch (x) {\ncase 0:\ncase 1:\n    a();\n    break;\ndefault:\n    break\n}');
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\ncase -1:\n    break;\ncase !y:\n    break;\n}');
+            //  -- output --
+            'switch (x) {\n' +
+            'case 0:\n' +
+            'case 1:\n' +
+            '    a();\n' +
+            '    break;\n' +
+            'default:\n' +
+            '    break\n' +
+            '}');
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            //  -- output --
+            'switch (x) {\n' +
+            'case -1:\n' +
+            '    break;\n' +
+            'case !y:\n' +
+            '    break;\n' +
+            '}');
         
         // typical greasemonkey start
-        test_fragment('// comment 2\n(function ()');
+        test_fragment(
+            '// comment 2\n' +
+            '(function ()');
         bt(
             'var a2, b2, c2, d2 = 0, c = function() {}, d = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';');
-        bt(
-            'var a2, b2, c2, d2 = 0, c = function() {},\nd = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';');
+            //  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';');
+        bt(
+            'var a2, b2, c2, d2 = 0, c = function() {},\n' +
+            'd = \'\';',
+            //  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';');
         bt(
             'var o2=$.extend(a);function(){alert(x);}',
-            'var o2 = $.extend(a);\n\nfunction () {\n    alert(x);\n}');
-        bt('function*() {\n    yield 1;\n}', 'function* () {\n    yield 1;\n}');
-        bt('function* x() {\n    yield 1;\n}');
+            //  -- output --
+            'var o2 = $.extend(a);\n' +
+            '\n' +
+            'function () {\n' +
+            '    alert(x);\n' +
+            '}');
+        bt(
+            'function*() {\n' +
+            '    yield 1;\n' +
+            '}',
+            //  -- output --
+            'function* () {\n' +
+            '    yield 1;\n' +
+            '}');
+        bt(
+            'function* x() {\n' +
+            '    yield 1;\n' +
+            '}');
 
         // jslint and space after anon function - (f = " ", c = "    ")
         reset_options();
@@ -1977,33 +2506,91 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.space_after_anon_function = true;
         bt(
             'a=typeof(x)',
+            //  -- output --
             'a = typeof (x)');
         bt(
-            'x();\n\nfunction(){}',
-            'x();\n\nfunction () {}');
+            'x();\n' +
+            '\n' +
+            'function(){}',
+            //  -- output --
+            'x();\n' +
+            '\n' +
+            'function () {}');
         bt(
-            'x();\n\nvar x = {\nx: function(){}\n}',
-            'x();\n\nvar x = {\n    x: function () {}\n}');
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            'x: function(){}\n' +
+            '}',
+            //  -- output --
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            '    x: function () {}\n' +
+            '}');
         bt(
-            'function () {\n    var a, b, c, d, e = [],\n        f;\n}');
+            'function () {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}');
         bt(
             'switch(x) {case 0: case 1: a(); break; default: break}',
-            'switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}');
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}');
+            //  -- output --
+            'switch (x) {\n' +
+            '    case 0:\n' +
+            '    case 1:\n' +
+            '        a();\n' +
+            '        break;\n' +
+            '    default:\n' +
+            '        break\n' +
+            '}');
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            //  -- output --
+            'switch (x) {\n' +
+            '    case -1:\n' +
+            '        break;\n' +
+            '    case !y:\n' +
+            '        break;\n' +
+            '}');
         
         // typical greasemonkey start
-        test_fragment('// comment 2\n(function ()');
+        test_fragment(
+            '// comment 2\n' +
+            '(function ()');
         bt(
             'var a2, b2, c2, d2 = 0, c = function() {}, d = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';');
-        bt(
-            'var a2, b2, c2, d2 = 0, c = function() {},\nd = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';');
+            //  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';');
+        bt(
+            'var a2, b2, c2, d2 = 0, c = function() {},\n' +
+            'd = \'\';',
+            //  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';');
         bt(
             'var o2=$.extend(a);function(){alert(x);}',
-            'var o2 = $.extend(a);\n\nfunction () {\n    alert(x);\n}');
-        bt('function*() {\n    yield 1;\n}', 'function* () {\n    yield 1;\n}');
-        bt('function* x() {\n    yield 1;\n}');
+            //  -- output --
+            'var o2 = $.extend(a);\n' +
+            '\n' +
+            'function () {\n' +
+            '    alert(x);\n' +
+            '}');
+        bt(
+            'function*() {\n' +
+            '    yield 1;\n' +
+            '}',
+            //  -- output --
+            'function* () {\n' +
+            '    yield 1;\n' +
+            '}');
+        bt(
+            'function* x() {\n' +
+            '    yield 1;\n' +
+            '}');
 
         // jslint and space after anon function - (f = "", c = "    ")
         reset_options();
@@ -2011,34 +2598,92 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         opts.space_after_anon_function = false;
         bt(
             'a=typeof(x)',
+            //  -- output --
             'a = typeof(x)');
         bt(
-            'x();\n\nfunction(){}',
-            'x();\n\nfunction() {}');
+            'x();\n' +
+            '\n' +
+            'function(){}',
+            //  -- output --
+            'x();\n' +
+            '\n' +
+            'function() {}');
         bt(
-            'x();\n\nvar x = {\nx: function(){}\n}',
-            'x();\n\nvar x = {\n    x: function() {}\n}');
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            'x: function(){}\n' +
+            '}',
+            //  -- output --
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            '    x: function() {}\n' +
+            '}');
         bt(
-            'function () {\n    var a, b, c, d, e = [],\n        f;\n}',
-            'function() {\n    var a, b, c, d, e = [],\n        f;\n}');
+            'function () {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}',
+            //  -- output --
+            'function() {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}');
         bt(
             'switch(x) {case 0: case 1: a(); break; default: break}',
-            'switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}');
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}');
+            //  -- output --
+            'switch (x) {\n' +
+            '    case 0:\n' +
+            '    case 1:\n' +
+            '        a();\n' +
+            '        break;\n' +
+            '    default:\n' +
+            '        break\n' +
+            '}');
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            //  -- output --
+            'switch (x) {\n' +
+            '    case -1:\n' +
+            '        break;\n' +
+            '    case !y:\n' +
+            '        break;\n' +
+            '}');
         
         // typical greasemonkey start
-        test_fragment('// comment 2\n(function()');
+        test_fragment(
+            '// comment 2\n' +
+            '(function()');
         bt(
             'var a2, b2, c2, d2 = 0, c = function() {}, d = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function() {},\n    d = \'\';');
-        bt(
-            'var a2, b2, c2, d2 = 0, c = function() {},\nd = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function() {},\n    d = \'\';');
+            //  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function() {},\n' +
+            '    d = \'\';');
+        bt(
+            'var a2, b2, c2, d2 = 0, c = function() {},\n' +
+            'd = \'\';',
+            //  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function() {},\n' +
+            '    d = \'\';');
         bt(
             'var o2=$.extend(a);function(){alert(x);}',
-            'var o2 = $.extend(a);\n\nfunction() {\n    alert(x);\n}');
-        bt('function*() {\n    yield 1;\n}');
-        bt('function* x() {\n    yield 1;\n}');
+            //  -- output --
+            'var o2 = $.extend(a);\n' +
+            '\n' +
+            'function() {\n' +
+            '    alert(x);\n' +
+            '}');
+        bt(
+            'function*() {\n' +
+            '    yield 1;\n' +
+            '}');
+        bt(
+            'function* x() {\n' +
+            '    yield 1;\n' +
+            '}');
 
 
         //============================================================
@@ -2080,6 +2725,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             'var test = 1;');
         bt(
             '(function() {if (!window.FOO) window.FOO || (window.FOO = function() {var b = {bar: "zort"};});})();',
+            //  -- output --
             '(function() {\n' +
             '    if (!window.FOO) window.FOO || (window.FOO = function() {\n' +
             '        var b = {\n' +
@@ -2171,6 +2817,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         // Issue 331 - if-else with braces edge case
         bt(
             'if(x){a();}else{b();}if(y){c();}',
+            //  -- output --
             'if (x) {\n' +
             '    a();\n' +
             '} else {\n' +
@@ -2520,6 +3167,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function kindaComplex() {\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2538,6 +3186,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        }\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function complex() {\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2563,6 +3212,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function kindaComplex()\n{\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2581,6 +3231,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        }\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function complex()\n{\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2606,6 +3257,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function kindaComplex() {\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2624,6 +3276,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        }\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function complex() {\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2649,6 +3302,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function kindaComplex() {\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2667,6 +3321,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        }\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function complex() {\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2692,6 +3347,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function kindaComplex() {\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2710,6 +3366,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        }\n' +
             '    };\n' +
             '}',
+            //  -- output --
             'function complex() {\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2756,8 +3413,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '}');
         
         // Issue 315 - Short objects
-        bt(
-            'var a = { b: { c: { d: e } } };');
+        bt('var a = { b: { c: { d: e } } };');
         bt(
             'var a = {\n' +
             '    b: {\n' +
@@ -2829,31 +3485,87 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         reset_options();
         bt('');
         test_fragment('   return .5');
-        test_fragment('   return .5;\n   a();');
-        test_fragment('    return .5;\n    a();');
-        test_fragment('     return .5;\n     a();');
+        test_fragment(
+            '   return .5;\n' +
+            '   a();');
+        test_fragment(
+            '    return .5;\n' +
+            '    a();');
+        test_fragment(
+            '     return .5;\n' +
+            '     a();');
         test_fragment('   < div');
         bt('a        =          1', 'a = 1');
         bt('a=1', 'a = 1');
         bt('(3) / 2');
         bt('["a", "b"].join("")');
-        bt('a();\n\nb();');
-        bt('var a = 1 var b = 2', 'var a = 1\nvar b = 2');
-        bt('var a=1, b=c[d], e=6;', 'var a = 1,\n    b = c[d],\n    e = 6;');
-        bt('var a,\n    b,\n    c;');
-        bt('let a = 1 let b = 2', 'let a = 1\nlet b = 2');
-        bt('let a=1, b=c[d], e=6;', 'let a = 1,\n    b = c[d],\n    e = 6;');
-        bt('let a,\n    b,\n    c;');
-        bt('const a = 1 const b = 2', 'const a = 1\nconst b = 2');
-        bt('const a=1, b=c[d], e=6;', 'const a = 1,\n    b = c[d],\n    e = 6;');
-        bt('const a,\n    b,\n    c;');
+        bt(
+            'a();\n' +
+            '\n' +
+            'b();');
+        bt(
+            'var a = 1 var b = 2',
+            //  -- output --
+            'var a = 1\n' +
+            'var b = 2');
+        bt(
+            'var a=1, b=c[d], e=6;',
+            //  -- output --
+            'var a = 1,\n' +
+            '    b = c[d],\n' +
+            '    e = 6;');
+        bt(
+            'var a,\n' +
+            '    b,\n' +
+            '    c;');
+        bt(
+            'let a = 1 let b = 2',
+            //  -- output --
+            'let a = 1\n' +
+            'let b = 2');
+        bt(
+            'let a=1, b=c[d], e=6;',
+            //  -- output --
+            'let a = 1,\n' +
+            '    b = c[d],\n' +
+            '    e = 6;');
+        bt(
+            'let a,\n' +
+            '    b,\n' +
+            '    c;');
+        bt(
+            'const a = 1 const b = 2',
+            //  -- output --
+            'const a = 1\n' +
+            'const b = 2');
+        bt(
+            'const a=1, b=c[d], e=6;',
+            //  -- output --
+            'const a = 1,\n' +
+            '    b = c[d],\n' +
+            '    e = 6;');
+        bt(
+            'const a,\n' +
+            '    b,\n' +
+            '    c;');
         bt('a = " 12345 "');
         bt('a = \' 12345 \'');
         bt('if (a == 1) b = 2;');
-        bt('if(1){2}else{3}', 'if (1) {\n    2\n} else {\n    3\n}');
+        bt(
+            'if(1){2}else{3}',
+            //  -- output --
+            'if (1) {\n' +
+            '    2\n' +
+            '} else {\n' +
+            '    3\n' +
+            '}');
         bt('if(1||2);', 'if (1 || 2);');
         bt('(a==1)||(b==2)', '(a == 1) || (b == 2)');
-        bt('var a = 1 if (2) 3;', 'var a = 1\nif (2) 3;');
+        bt(
+            'var a = 1 if (2) 3;',
+            //  -- output --
+            'var a = 1\n' +
+            'if (2) 3;');
         bt('a = a + 1');
         bt('a = a == 1');
         bt('/12345[^678]*9+/.match(a)');
@@ -2956,79 +3668,262 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         bt('a=0Bg0b0o0', 'a = 0B g0b0o0');
         bt('a = [1, 2, 3, 4]');
         bt('F*(g/=f)*g+b', 'F * (g /= f) * g + b');
-        bt('a.b({c:d})', 'a.b({\n    c: d\n})');
-        bt('a.b\n(\n{\nc:\nd\n}\n)', 'a.b({\n    c: d\n})');
-        bt('a.b({c:"d"})', 'a.b({\n    c: "d"\n})');
-        bt('a.b\n(\n{\nc:\n"d"\n}\n)', 'a.b({\n    c: "d"\n})');
+        bt(
+            'a.b({c:d})',
+            //  -- output --
+            'a.b({\n' +
+            '    c: d\n' +
+            '})');
+        bt(
+            'a.b\n' +
+            '(\n' +
+            '{\n' +
+            'c:\n' +
+            'd\n' +
+            '}\n' +
+            ')',
+            //  -- output --
+            'a.b({\n' +
+            '    c: d\n' +
+            '})');
+        bt(
+            'a.b({c:"d"})',
+            //  -- output --
+            'a.b({\n' +
+            '    c: "d"\n' +
+            '})');
+        bt(
+            'a.b\n' +
+            '(\n' +
+            '{\n' +
+            'c:\n' +
+            '"d"\n' +
+            '}\n' +
+            ')',
+            //  -- output --
+            'a.b({\n' +
+            '    c: "d"\n' +
+            '})');
         bt('a=!b', 'a = !b');
         bt('a=!!b', 'a = !!b');
         bt('a?b:c', 'a ? b : c');
         bt('a?1:2', 'a ? 1 : 2');
         bt('a?(b):c', 'a ? (b) : c');
-        bt('x={a:1,b:w=="foo"?x:y,c:z}', 'x = {\n    a: 1,\n    b: w == "foo" ? x : y,\n    c: z\n}');
+        bt(
+            'x={a:1,b:w=="foo"?x:y,c:z}',
+            //  -- output --
+            'x = {\n' +
+            '    a: 1,\n' +
+            '    b: w == "foo" ? x : y,\n' +
+            '    c: z\n' +
+            '}');
         bt('x=a?b?c?d:e:f:g;', 'x = a ? b ? c ? d : e : f : g;');
-        bt('x=a?b?c?d:{e1:1,e2:2}:f:g;', 'x = a ? b ? c ? d : {\n    e1: 1,\n    e2: 2\n} : f : g;');
+        bt(
+            'x=a?b?c?d:{e1:1,e2:2}:f:g;',
+            //  -- output --
+            'x = a ? b ? c ? d : {\n' +
+            '    e1: 1,\n' +
+            '    e2: 2\n' +
+            '} : f : g;');
         bt('function void(void) {}');
         bt('if(!a)foo();', 'if (!a) foo();');
         bt('a=~a', 'a = ~a');
-        bt('a;/*comment*/b;', 'a; /*comment*/\nb;');
-        bt('a;/* comment */b;', 'a; /* comment */\nb;');
+        bt(
+            'a;/*comment*/b;',
+            //  -- output --
+            'a; /*comment*/\n' +
+            'b;');
+        bt(
+            'a;/* comment */b;',
+            //  -- output --
+            'a; /* comment */\n' +
+            'b;');
         
         // simple comments don't get touched at all
-        test_fragment('a;/*\ncomment\n*/b;', 'a;\n/*\ncomment\n*/\nb;');
-        bt('a;/**\n* javadoc\n*/b;', 'a;\n/**\n * javadoc\n */\nb;');
-        test_fragment('a;/**\n\nno javadoc\n*/b;', 'a;\n/**\n\nno javadoc\n*/\nb;');
+        test_fragment(
+            'a;/*\n' +
+            'comment\n' +
+            '*/b;',
+            //  -- output --
+            'a;\n' +
+            '/*\n' +
+            'comment\n' +
+            '*/\n' +
+            'b;');
+        bt(
+            'a;/**\n' +
+            '* javadoc\n' +
+            '*/b;',
+            //  -- output --
+            'a;\n' +
+            '/**\n' +
+            ' * javadoc\n' +
+            ' */\n' +
+            'b;');
+        test_fragment(
+            'a;/**\n' +
+            '\n' +
+            'no javadoc\n' +
+            '*/b;',
+            //  -- output --
+            'a;\n' +
+            '/**\n' +
+            '\n' +
+            'no javadoc\n' +
+            '*/\n' +
+            'b;');
         
         // comment blocks detected and reindented even w/o javadoc starter
-        bt('a;/*\n* javadoc\n*/b;', 'a;\n/*\n * javadoc\n */\nb;');
+        bt(
+            'a;/*\n' +
+            '* javadoc\n' +
+            '*/b;',
+            //  -- output --
+            'a;\n' +
+            '/*\n' +
+            ' * javadoc\n' +
+            ' */\n' +
+            'b;');
         bt('if(a)break;', 'if (a) break;');
-        bt('if(a){break}', 'if (a) {\n    break\n}');
+        bt(
+            'if(a){break}',
+            //  -- output --
+            'if (a) {\n' +
+            '    break\n' +
+            '}');
         bt('if((a))foo();', 'if ((a)) foo();');
         bt('for(var i=0;;) a', 'for (var i = 0;;) a');
-        bt('for(var i=0;;)\na', 'for (var i = 0;;)\n    a');
+        bt(
+            'for(var i=0;;)\n' +
+            'a',
+            //  -- output --
+            'for (var i = 0;;)\n' +
+            '    a');
         bt('a++;');
         bt('for(;;i++)a()', 'for (;; i++) a()');
-        bt('for(;;i++)\na()', 'for (;; i++)\n    a()');
+        bt(
+            'for(;;i++)\n' +
+            'a()',
+            //  -- output --
+            'for (;; i++)\n' +
+            '    a()');
         bt('for(;;++i)a', 'for (;; ++i) a');
         bt('return(1)', 'return (1)');
-        bt('try{a();}catch(b){c();}finally{d();}', 'try {\n    a();\n} catch (b) {\n    c();\n} finally {\n    d();\n}');
+        bt(
+            'try{a();}catch(b){c();}finally{d();}',
+            //  -- output --
+            'try {\n' +
+            '    a();\n' +
+            '} catch (b) {\n' +
+            '    c();\n' +
+            '} finally {\n' +
+            '    d();\n' +
+            '}');
         
         //  magic function call
         bt('(xx)()');
         
         // another magic function call
         bt('a[1]()');
-        bt('if(a){b();}else if(c) foo();', 'if (a) {\n    b();\n} else if (c) foo();');
-        bt('switch(x) {case 0: case 1: a(); break; default: break}', 'switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}');
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}');
+        bt(
+            'if(a){b();}else if(c) foo();',
+            //  -- output --
+            'if (a) {\n' +
+            '    b();\n' +
+            '} else if (c) foo();');
+        bt(
+            'switch(x) {case 0: case 1: a(); break; default: break}',
+            //  -- output --
+            'switch (x) {\n' +
+            '    case 0:\n' +
+            '    case 1:\n' +
+            '        a();\n' +
+            '        break;\n' +
+            '    default:\n' +
+            '        break\n' +
+            '}');
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            //  -- output --
+            'switch (x) {\n' +
+            '    case -1:\n' +
+            '        break;\n' +
+            '    case !y:\n' +
+            '        break;\n' +
+            '}');
         bt('a !== b');
-        bt('if (a) b(); else c();', 'if (a) b();\nelse c();');
+        bt(
+            'if (a) b(); else c();',
+            //  -- output --
+            'if (a) b();\n' +
+            'else c();');
         
         // typical greasemonkey start
-        bt('// comment\n(function something() {})');
+        bt(
+            '// comment\n' +
+            '(function something() {})');
         
         // duplicating newlines
-        bt('{\n\n    x();\n\n}');
+        bt(
+            '{\n' +
+            '\n' +
+            '    x();\n' +
+            '\n' +
+            '}');
         bt('if (a in b) foo();');
         bt('if (a of b) foo();');
         bt('if (a of [1, 2, 3]) foo();');
-        bt('if(X)if(Y)a();else b();else c();', 'if (X)\n    if (Y) a();\n    else b();\nelse c();');
-        bt('if (foo) bar();\nelse break');
+        bt(
+            'if(X)if(Y)a();else b();else c();',
+            //  -- output --
+            'if (X)\n' +
+            '    if (Y) a();\n' +
+            '    else b();\n' +
+            'else c();');
+        bt(
+            'if (foo) bar();\n' +
+            'else break');
         bt('var a, b;');
         bt('var a = new function();');
         test_fragment('new function');
         bt('var a, b');
-        bt('{a:1, b:2}', '{\n    a: 1,\n    b: 2\n}');
-        bt('a={1:[-1],2:[+1]}', 'a = {\n    1: [-1],\n    2: [+1]\n}');
-        bt('var l = {\'a\':\'1\', \'b\':\'2\'}', 'var l = {\n    \'a\': \'1\',\n    \'b\': \'2\'\n}');
+        bt(
+            '{a:1, b:2}',
+            //  -- output --
+            '{\n' +
+            '    a: 1,\n' +
+            '    b: 2\n' +
+            '}');
+        bt(
+            'a={1:[-1],2:[+1]}',
+            //  -- output --
+            'a = {\n' +
+            '    1: [-1],\n' +
+            '    2: [+1]\n' +
+            '}');
+        bt(
+            'var l = {\'a\':\'1\', \'b\':\'2\'}',
+            //  -- output --
+            'var l = {\n' +
+            '    \'a\': \'1\',\n' +
+            '    \'b\': \'2\'\n' +
+            '}');
         bt('if (template.user[n] in bk) foo();');
         bt('return 45');
-        bt('return this.prevObject ||\n\n    this.constructor(null);');
+        bt(
+            'return this.prevObject ||\n' +
+            '\n' +
+            '    this.constructor(null);');
         bt('If[1]');
         bt('Then[1]');
         bt('a = 1;// comment', 'a = 1; // comment');
         bt('a = 1; // comment');
-        bt('a = 1;\n // comment', 'a = 1;\n// comment');
+        bt(
+            'a = 1;\n' +
+            ' // comment',
+            //  -- output --
+            'a = 1;\n' +
+            '// comment');
         bt('a = [-1, -1, -1]');
         bt(
             '// a\n' +
@@ -3046,106 +3941,375 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '// end-func-comment');
         
         // The exact formatting these should have is open for discussion, but they are at least reasonable
-        bt('a = [ // comment\n    -1, -1, -1\n]');
-        bt('var a = [ // comment\n    -1, -1, -1\n]');
-        bt('a = [ // comment\n    -1, // comment\n    -1, -1\n]');
-        bt('var a = [ // comment\n    -1, // comment\n    -1, -1\n]');
-        bt('o = [{a:b},{c:d}]', 'o = [{\n    a: b\n}, {\n    c: d\n}]');
+        bt(
+            'a = [ // comment\n' +
+            '    -1, -1, -1\n' +
+            ']');
+        bt(
+            'var a = [ // comment\n' +
+            '    -1, -1, -1\n' +
+            ']');
+        bt(
+            'a = [ // comment\n' +
+            '    -1, // comment\n' +
+            '    -1, -1\n' +
+            ']');
+        bt(
+            'var a = [ // comment\n' +
+            '    -1, // comment\n' +
+            '    -1, -1\n' +
+            ']');
+        bt(
+            'o = [{a:b},{c:d}]',
+            //  -- output --
+            'o = [{\n' +
+            '    a: b\n' +
+            '}, {\n' +
+            '    c: d\n' +
+            '}]');
         
         // was: extra space appended
-        bt('if (a) {\n    do();\n}');
+        bt(
+            'if (a) {\n' +
+            '    do();\n' +
+            '}');
         
         // if/else statement with empty body
-        bt('if (a) {\n// comment\n}else{\n// comment\n}', 'if (a) {\n    // comment\n} else {\n    // comment\n}');
-        
-        // multiple comments indentation
-        bt('if (a) {\n// comment\n// comment\n}', 'if (a) {\n    // comment\n    // comment\n}');
-        bt('if (a) b() else c();', 'if (a) b()\nelse c();');
-        bt('if (a) b() else if c() d();', 'if (a) b()\nelse if c() d();');
+        bt(
+            'if (a) {\n' +
+            '// comment\n' +
+            '}else{\n' +
+            '// comment\n' +
+            '}',
+            //  -- output --
+            'if (a) {\n' +
+            '    // comment\n' +
+            '} else {\n' +
+            '    // comment\n' +
+            '}');
+        
+        // multiple comments indentation
+        bt(
+            'if (a) {\n' +
+            '// comment\n' +
+            '// comment\n' +
+            '}',
+            //  -- output --
+            'if (a) {\n' +
+            '    // comment\n' +
+            '    // comment\n' +
+            '}');
+        bt(
+            'if (a) b() else c();',
+            //  -- output --
+            'if (a) b()\n' +
+            'else c();');
+        bt(
+            'if (a) b() else if c() d();',
+            //  -- output --
+            'if (a) b()\n' +
+            'else if c() d();');
         bt('{}');
-        bt('{\n\n}');
-        bt('do { a(); } while ( 1 );', 'do {\n    a();\n} while (1);');
+        bt(
+            '{\n' +
+            '\n' +
+            '}');
+        bt(
+            'do { a(); } while ( 1 );',
+            //  -- output --
+            'do {\n' +
+            '    a();\n' +
+            '} while (1);');
         bt('do {} while (1);');
-        bt('do {\n} while (1);', 'do {} while (1);');
-        bt('do {\n\n} while (1);');
+        bt(
+            'do {\n' +
+            '} while (1);',
+            //  -- output --
+            'do {} while (1);');
+        bt(
+            'do {\n' +
+            '\n' +
+            '} while (1);');
         bt('var a = x(a, b, c)');
-        bt('delete x if (a) b();', 'delete x\nif (a) b();');
-        bt('delete x[x] if (a) b();', 'delete x[x]\nif (a) b();');
+        bt(
+            'delete x if (a) b();',
+            //  -- output --
+            'delete x\n' +
+            'if (a) b();');
+        bt(
+            'delete x[x] if (a) b();',
+            //  -- output --
+            'delete x[x]\n' +
+            'if (a) b();');
         bt('for(var a=1,b=2)d', 'for (var a = 1, b = 2) d');
         bt('for(var a=1,b=2,c=3) d', 'for (var a = 1, b = 2, c = 3) d');
-        bt('for(var a=1,b=2,c=3;d<3;d++)\ne', 'for (var a = 1, b = 2, c = 3; d < 3; d++)\n    e');
-        bt('function x(){(a||b).c()}', 'function x() {\n    (a || b).c()\n}');
-        bt('function x(){return - 1}', 'function x() {\n    return -1\n}');
-        bt('function x(){return ! a}', 'function x() {\n    return !a\n}');
+        bt(
+            'for(var a=1,b=2,c=3;d<3;d++)\n' +
+            'e',
+            //  -- output --
+            'for (var a = 1, b = 2, c = 3; d < 3; d++)\n' +
+            '    e');
+        bt(
+            'function x(){(a||b).c()}',
+            //  -- output --
+            'function x() {\n' +
+            '    (a || b).c()\n' +
+            '}');
+        bt(
+            'function x(){return - 1}',
+            //  -- output --
+            'function x() {\n' +
+            '    return -1\n' +
+            '}');
+        bt(
+            'function x(){return ! a}',
+            //  -- output --
+            'function x() {\n' +
+            '    return !a\n' +
+            '}');
         bt('x => x');
         bt('(x) => x');
-        bt('x => { x }', 'x => {\n    x\n}');
-        bt('(x) => { x }', '(x) => {\n    x\n}');
+        bt(
+            'x => { x }',
+            //  -- output --
+            'x => {\n' +
+            '    x\n' +
+            '}');
+        bt(
+            '(x) => { x }',
+            //  -- output --
+            '(x) => {\n' +
+            '    x\n' +
+            '}');
         
         // a common snippet in jQuery plugins
         bt(
             'settings = $.extend({},defaults,settings);',
+            //  -- output --
             'settings = $.extend({}, defaults, settings);');
         bt('$http().then().finally().default()');
-        bt('$http()\n.then()\n.finally()\n.default()', '$http()\n    .then()\n    .finally()\n    .default()');
+        bt(
+            '$http()\n' +
+            '.then()\n' +
+            '.finally()\n' +
+            '.default()',
+            //  -- output --
+            '$http()\n' +
+            '    .then()\n' +
+            '    .finally()\n' +
+            '    .default()');
         bt('$http().when.in.new.catch().throw()');
-        bt('$http()\n.when\n.in\n.new\n.catch()\n.throw()', '$http()\n    .when\n    .in\n    .new\n    .catch()\n    .throw()');
-        bt('{xxx;}()', '{\n    xxx;\n}()');
-        bt('a = \'a\'\nb = \'b\'');
+        bt(
+            '$http()\n' +
+            '.when\n' +
+            '.in\n' +
+            '.new\n' +
+            '.catch()\n' +
+            '.throw()',
+            //  -- output --
+            '$http()\n' +
+            '    .when\n' +
+            '    .in\n' +
+            '    .new\n' +
+            '    .catch()\n' +
+            '    .throw()');
+        bt(
+            '{xxx;}()',
+            //  -- output --
+            '{\n' +
+            '    xxx;\n' +
+            '}()');
+        bt(
+            'a = \'a\'\n' +
+            'b = \'b\'');
         bt('a = /reg/exp');
         bt('a = /reg/');
         bt('/abc/.test()');
         bt('/abc/i.test()');
-        bt('{/abc/i.test()}', '{\n    /abc/i.test()\n}');
+        bt(
+            '{/abc/i.test()}',
+            //  -- output --
+            '{\n' +
+            '    /abc/i.test()\n' +
+            '}');
         bt('var x=(a)/a;', 'var x = (a) / a;');
         bt('x != -1');
         bt('for (; s-->0;)t', 'for (; s-- > 0;) t');
         bt('for (; s++>0;)u', 'for (; s++ > 0;) u');
         bt('a = s++>s--;', 'a = s++ > s--;');
         bt('a = s++>--s;', 'a = s++ > --s;');
-        bt('{x=#1=[]}', '{\n    x = #1=[]\n}');
-        bt('{a:#1={}}', '{\n    a: #1={}\n}');
-        bt('{a:#1#}', '{\n    a: #1#\n}');
+        bt(
+            '{x=#1=[]}',
+            //  -- output --
+            '{\n' +
+            '    x = #1=[]\n' +
+            '}');
+        bt(
+            '{a:#1={}}',
+            //  -- output --
+            '{\n' +
+            '    a: #1={}\n' +
+            '}');
+        bt(
+            '{a:#1#}',
+            //  -- output --
+            '{\n' +
+            '    a: #1#\n' +
+            '}');
         test_fragment('"incomplete-string');
         test_fragment('\'incomplete-string');
         test_fragment('/incomplete-regex');
         test_fragment('`incomplete-template-string');
-        test_fragment('{a:1},{a:2}', '{\n    a: 1\n}, {\n    a: 2\n}');
-        test_fragment('var ary=[{a:1}, {a:2}];', 'var ary = [{\n    a: 1\n}, {\n    a: 2\n}];');
+        test_fragment(
+            '{a:1},{a:2}',
+            //  -- output --
+            '{\n' +
+            '    a: 1\n' +
+            '}, {\n' +
+            '    a: 2\n' +
+            '}');
+        test_fragment(
+            'var ary=[{a:1}, {a:2}];',
+            //  -- output --
+            'var ary = [{\n' +
+            '    a: 1\n' +
+            '}, {\n' +
+            '    a: 2\n' +
+            '}];');
         
         // incomplete
-        test_fragment('{a:#1', '{\n    a: #1');
+        test_fragment(
+            '{a:#1',
+            //  -- output --
+            '{\n' +
+            '    a: #1');
         
         // incomplete
-        test_fragment('{a:#', '{\n    a: #');
+        test_fragment(
+            '{a:#',
+            //  -- output --
+            '{\n' +
+            '    a: #');
         
         // incomplete
-        test_fragment('}}}', '}\n}\n}');
-        test_fragment('<!--\nvoid();\n// -->');
+        test_fragment(
+            '}}}',
+            //  -- output --
+            '}\n' +
+            '}\n' +
+            '}');
+        test_fragment(
+            '<!--\n' +
+            'void();\n' +
+            '// -->');
         
         // incomplete regexp
         test_fragment('a=/regexp', 'a = /regexp');
-        bt('{a:#1=[],b:#1#,c:#999999#}', '{\n    a: #1=[],\n    b: #1#,\n    c: #999999#\n}');
-        bt('do{x()}while(a>1)', 'do {\n    x()\n} while (a > 1)');
-        bt('x(); /reg/exp.match(something)', 'x();\n/reg/exp.match(something)');
-        test_fragment('something();(', 'something();\n(');
-        test_fragment('#!she/bangs, she bangs\nf=1', '#!she/bangs, she bangs\n\nf = 1');
-        test_fragment('#!she/bangs, she bangs\n\nf=1', '#!she/bangs, she bangs\n\nf = 1');
-        test_fragment('#!she/bangs, she bangs\n\n/* comment */');
-        test_fragment('#!she/bangs, she bangs\n\n\n/* comment */');
+        bt(
+            '{a:#1=[],b:#1#,c:#999999#}',
+            //  -- output --
+            '{\n' +
+            '    a: #1=[],\n' +
+            '    b: #1#,\n' +
+            '    c: #999999#\n' +
+            '}');
+        bt(
+            'do{x()}while(a>1)',
+            //  -- output --
+            'do {\n' +
+            '    x()\n' +
+            '} while (a > 1)');
+        bt(
+            'x(); /reg/exp.match(something)',
+            //  -- output --
+            'x();\n' +
+            '/reg/exp.match(something)');
+        test_fragment(
+            'something();(',
+            //  -- output --
+            'something();\n' +
+            '(');
+        test_fragment(
+            '#!she/bangs, she bangs\n' +
+            'f=1',
+            //  -- output --
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            'f = 1');
+        test_fragment(
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            'f=1',
+            //  -- output --
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            'f = 1');
+        test_fragment(
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            '/* comment */');
+        test_fragment(
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            '\n' +
+            '/* comment */');
         test_fragment('#');
         test_fragment('#!');
         bt('function namespace::something()');
-        test_fragment('<!--\nsomething();\n-->');
-        test_fragment('<!--\nif(i<0){bla();}\n-->', '<!--\nif (i < 0) {\n    bla();\n}\n-->');
-        bt('{foo();--bar;}', '{\n    foo();\n    --bar;\n}');
-        bt('{foo();++bar;}', '{\n    foo();\n    ++bar;\n}');
-        bt('{--bar;}', '{\n    --bar;\n}');
-        bt('{++bar;}', '{\n    ++bar;\n}');
+        test_fragment(
+            '<!--\n' +
+            'something();\n' +
+            '-->');
+        test_fragment(
+            '<!--\n' +
+            'if(i<0){bla();}\n' +
+            '-->',
+            //  -- output --
+            '<!--\n' +
+            'if (i < 0) {\n' +
+            '    bla();\n' +
+            '}\n' +
+            '-->');
+        bt(
+            '{foo();--bar;}',
+            //  -- output --
+            '{\n' +
+            '    foo();\n' +
+            '    --bar;\n' +
+            '}');
+        bt(
+            '{foo();++bar;}',
+            //  -- output --
+            '{\n' +
+            '    foo();\n' +
+            '    ++bar;\n' +
+            '}');
+        bt(
+            '{--bar;}',
+            //  -- output --
+            '{\n' +
+            '    --bar;\n' +
+            '}');
+        bt(
+            '{++bar;}',
+            //  -- output --
+            '{\n' +
+            '    ++bar;\n' +
+            '}');
         bt('if(true)++a;', 'if (true) ++a;');
-        bt('if(true)\n++a;', 'if (true)\n    ++a;');
+        bt(
+            'if(true)\n' +
+            '++a;',
+            //  -- output --
+            'if (true)\n' +
+            '    ++a;');
         bt('if(true)--a;', 'if (true) --a;');
-        bt('if(true)\n--a;', 'if (true)\n    --a;');
+        bt(
+            'if(true)\n' +
+            '--a;',
+            //  -- output --
+            'if (true)\n' +
+            '    --a;');
         bt('elem[array]++;');
         bt('elem++ * elem[array]++;');
         bt('elem-- * -elem[array]++;');
@@ -3155,106 +4319,510 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         bt('elem-- - +elem[array]++;');
         
         // Handling of newlines around unary ++ and -- operators
-        bt('{foo\n++bar;}', '{\n    foo\n    ++bar;\n}');
-        bt('{foo++\nbar;}', '{\n    foo++\n    bar;\n}');
+        bt(
+            '{foo\n' +
+            '++bar;}',
+            //  -- output --
+            '{\n' +
+            '    foo\n' +
+            '    ++bar;\n' +
+            '}');
+        bt(
+            '{foo++\n' +
+            'bar;}',
+            //  -- output --
+            '{\n' +
+            '    foo++\n' +
+            '    bar;\n' +
+            '}');
         
         // This is invalid, but harder to guard against. Issue #203.
-        bt('{foo\n++\nbar;}', '{\n    foo\n    ++\n    bar;\n}');
+        bt(
+            '{foo\n' +
+            '++\n' +
+            'bar;}',
+            //  -- output --
+            '{\n' +
+            '    foo\n' +
+            '    ++\n' +
+            '    bar;\n' +
+            '}');
         
         // regexps
-        bt('a(/abc\\/\\/def/);b()', 'a(/abc\\/\\/def/);\nb()');
-        bt('a(/a[b\\[\\]c]d/);b()', 'a(/a[b\\[\\]c]d/);\nb()');
+        bt(
+            'a(/abc\\/\\/def/);b()',
+            //  -- output --
+            'a(/abc\\/\\/def/);\n' +
+            'b()');
+        bt(
+            'a(/a[b\\[\\]c]d/);b()',
+            //  -- output --
+            'a(/a[b\\[\\]c]d/);\n' +
+            'b()');
         
         // incomplete char class
         test_fragment('a(/a[b\\[');
         
         // allow unescaped / in char classes
-        bt('a(/[a/b]/);b()', 'a(/[a/b]/);\nb()');
+        bt(
+            'a(/[a/b]/);b()',
+            //  -- output --
+            'a(/[a/b]/);\n' +
+            'b()');
         bt('typeof /foo\\//;');
         bt('throw /foo\\//;');
         bt('do /foo\\//;');
         bt('return /foo\\//;');
-        bt('switch (a) {\n    case /foo\\//:\n        b\n}');
-        bt('if (a) /foo\\//\nelse /foo\\//;');
+        bt(
+            'switch (a) {\n' +
+            '    case /foo\\//:\n' +
+            '        b\n' +
+            '}');
+        bt(
+            'if (a) /foo\\//\n' +
+            'else /foo\\//;');
         bt('if (foo) /regex/.test();');
         bt('for (index in [1, 2, 3]) /^test$/i.test(s)');
-        bt('function foo() {\n    return [\n        "one",\n        "two"\n    ];\n}');
-        bt('a=[[1,2],[4,5],[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    [7, 8]\n]');
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]');
-        bt('a=[[1,2],[4,5],function(){},function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    function() {},\n    [7, 8]\n]');
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]');
+        bt(
+            'function foo() {\n' +
+            '    return [\n' +
+            '        "one",\n' +
+            '        "two"\n' +
+            '    ];\n' +
+            '}');
+        bt(
+            'a=[[1,2],[4,5],[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n' +
+            '    [4, 5],\n' +
+            '    [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n' +
+            '    [4, 5],\n' +
+            '    function() {},\n' +
+            '    [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],function(){},function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n' +
+            '    [4, 5],\n' +
+            '    function() {},\n' +
+            '    function() {},\n' +
+            '    [7, 8]\n' +
+            ']');
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            //  -- output --
+            'a = [\n' +
+            '    [1, 2],\n' +
+            '    [4, 5],\n' +
+            '    function() {},\n' +
+            '    [7, 8]\n' +
+            ']');
         bt('a=[b,c,function(){},function(){},d]', 'a = [b, c, function() {}, function() {}, d]');
-        bt('a=[b,c,\nfunction(){},function(){},d]', 'a = [b, c,\n    function() {},\n    function() {},\n    d\n]');
+        bt(
+            'a=[b,c,\n' +
+            'function(){},function(){},d]',
+            //  -- output --
+            'a = [b, c,\n' +
+            '    function() {},\n' +
+            '    function() {},\n' +
+            '    d\n' +
+            ']');
         bt('a=[a[1],b[4],c[d[7]]]', 'a = [a[1], b[4], c[d[7]]]');
         bt('[1,2,[3,4,[5,6],7],8]', '[1, 2, [3, 4, [5, 6], 7], 8]');
-        bt('[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]', '[\n    [\n        ["1", "2"],\n        ["3", "4"]\n    ],\n    [\n        ["5", "6", "7"],\n        ["8", "9", "0"]\n    ],\n    [\n        ["1", "2", "3"],\n        ["4", "5", "6", "7"],\n        ["8", "9", "0"]\n    ]\n]');
-        bt('{[x()[0]];indent;}', '{\n    [x()[0]];\n    indent;\n}');
-        bt('/*\n foo trailing space    \n * bar trailing space   \n**/');
-        bt('{\n    /*\n    foo    \n    * bar    \n    */\n}');
+        bt(
+            '[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]',
+            //  -- output --
+            '[\n' +
+            '    [\n' +
+            '        ["1", "2"],\n' +
+            '        ["3", "4"]\n' +
+            '    ],\n' +
+            '    [\n' +
+            '        ["5", "6", "7"],\n' +
+            '        ["8", "9", "0"]\n' +
+            '    ],\n' +
+            '    [\n' +
+            '        ["1", "2", "3"],\n' +
+            '        ["4", "5", "6", "7"],\n' +
+            '        ["8", "9", "0"]\n' +
+            '    ]\n' +
+            ']');
+        bt(
+            '{[x()[0]];indent;}',
+            //  -- output --
+            '{\n' +
+            '    [x()[0]];\n' +
+            '    indent;\n' +
+            '}');
+        bt(
+            '/*\n' +
+            ' foo trailing space    \n' +
+            ' * bar trailing space   \n' +
+            '**/');
+        bt(
+            '{\n' +
+            '    /*\n' +
+            '    foo    \n' +
+            '    * bar    \n' +
+            '    */\n' +
+            '}');
         bt('return ++i');
         bt('return !!x');
         bt('return !x');
         bt('return [1,2]', 'return [1, 2]');
         bt('return;');
-        bt('return\nfunc');
+        bt(
+            'return\n' +
+            'func');
         bt('catch(e)', 'catch (e)');
-        bt('var a=1,b={foo:2,bar:3},{baz:4,wham:5},c=4;', 'var a = 1,\n    b = {\n        foo: 2,\n        bar: 3\n    },\n    {\n        baz: 4,\n        wham: 5\n    }, c = 4;');
-        bt('var a=1,b={foo:2,bar:3},{baz:4,wham:5},\nc=4;', 'var a = 1,\n    b = {\n        foo: 2,\n        bar: 3\n    },\n    {\n        baz: 4,\n        wham: 5\n    },\n    c = 4;');
+        bt(
+            'var a=1,b={foo:2,bar:3},{baz:4,wham:5},c=4;',
+            //  -- output --
+            'var a = 1,\n' +
+            '    b = {\n' +
+            '        foo: 2,\n' +
+            '        bar: 3\n' +
+            '    },\n' +
+            '    {\n' +
+            '        baz: 4,\n' +
+            '        wham: 5\n' +
+            '    }, c = 4;');
+        bt(
+            'var a=1,b={foo:2,bar:3},{baz:4,wham:5},\n' +
+            'c=4;',
+            //  -- output --
+            'var a = 1,\n' +
+            '    b = {\n' +
+            '        foo: 2,\n' +
+            '        bar: 3\n' +
+            '    },\n' +
+            '    {\n' +
+            '        baz: 4,\n' +
+            '        wham: 5\n' +
+            '    },\n' +
+            '    c = 4;');
         
         // inline comment
         bt(
             'function x(/*int*/ start, /*string*/ foo)',
+            //  -- output --
             'function x( /*int*/ start, /*string*/ foo)');
         
         // javadoc comment
-        bt('/**\n* foo\n*/', '/**\n * foo\n */');
-        bt('{\n/**\n* foo\n*/\n}', '{\n    /**\n     * foo\n     */\n}');
+        bt(
+            '/**\n' +
+            '* foo\n' +
+            '*/',
+            //  -- output --
+            '/**\n' +
+            ' * foo\n' +
+            ' */');
+        bt(
+            '{\n' +
+            '/**\n' +
+            '* foo\n' +
+            '*/\n' +
+            '}',
+            //  -- output --
+            '{\n' +
+            '    /**\n' +
+            '     * foo\n' +
+            '     */\n' +
+            '}');
         
         // starless block comment
-        bt('/**\nfoo\n*/');
-        bt('/**\nfoo\n**/');
-        bt('/**\nfoo\nbar\n**/');
-        bt('/**\nfoo\n\nbar\n**/');
-        bt('/**\nfoo\n    bar\n**/');
-        bt('{\n/**\nfoo\n*/\n}', '{\n    /**\n    foo\n    */\n}');
-        bt('{\n/**\nfoo\n**/\n}', '{\n    /**\n    foo\n    **/\n}');
-        bt('{\n/**\nfoo\nbar\n**/\n}', '{\n    /**\n    foo\n    bar\n    **/\n}');
-        bt('{\n/**\nfoo\n\nbar\n**/\n}', '{\n    /**\n    foo\n\n    bar\n    **/\n}');
-        bt('{\n/**\nfoo\n    bar\n**/\n}', '{\n    /**\n    foo\n        bar\n    **/\n}');
-        bt('{\n    /**\n    foo\nbar\n    **/\n}');
-        bt('var a,b,c=1,d,e,f=2;', 'var a, b, c = 1,\n    d, e, f = 2;');
-        bt('var a,b,c=[],d,e,f=2;', 'var a, b, c = [],\n    d, e, f = 2;');
-        bt('function() {\n    var a, b, c, d, e = [],\n        f;\n}');
-        bt('do/regexp/;\nwhile(1);', 'do /regexp/;\nwhile (1);');
-        bt('var a = a,\na;\nb = {\nb\n}', 'var a = a,\n    a;\nb = {\n    b\n}');
-        bt('var a = a,\n    /* c */\n    b;');
-        bt('var a = a,\n    // c\n    b;');
+        bt(
+            '/**\n' +
+            'foo\n' +
+            '*/');
+        bt(
+            '/**\n' +
+            'foo\n' +
+            '**/');
+        bt(
+            '/**\n' +
+            'foo\n' +
+            'bar\n' +
+            '**/');
+        bt(
+            '/**\n' +
+            'foo\n' +
+            '\n' +
+            'bar\n' +
+            '**/');
+        bt(
+            '/**\n' +
+            'foo\n' +
+            '    bar\n' +
+            '**/');
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            '*/\n' +
+            '}',
+            //  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '    */\n' +
+            '}');
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            '**/\n' +
+            '}',
+            //  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '    **/\n' +
+            '}');
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            'bar\n' +
+            '**/\n' +
+            '}',
+            //  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '    bar\n' +
+            '    **/\n' +
+            '}');
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            '\n' +
+            'bar\n' +
+            '**/\n' +
+            '}',
+            //  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '\n' +
+            '    bar\n' +
+            '    **/\n' +
+            '}');
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            '    bar\n' +
+            '**/\n' +
+            '}',
+            //  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '        bar\n' +
+            '    **/\n' +
+            '}');
+        bt(
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            'bar\n' +
+            '    **/\n' +
+            '}');
+        bt(
+            'var a,b,c=1,d,e,f=2;',
+            //  -- output --
+            'var a, b, c = 1,\n' +
+            '    d, e, f = 2;');
+        bt(
+            'var a,b,c=[],d,e,f=2;',
+            //  -- output --
+            'var a, b, c = [],\n' +
+            '    d, e, f = 2;');
+        bt(
+            'function() {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}');
+        bt(
+            'do/regexp/;\n' +
+            'while(1);',
+            //  -- output --
+            'do /regexp/;\n' +
+            'while (1);');
+        bt(
+            'var a = a,\n' +
+            'a;\n' +
+            'b = {\n' +
+            'b\n' +
+            '}',
+            //  -- output --
+            'var a = a,\n' +
+            '    a;\n' +
+            'b = {\n' +
+            '    b\n' +
+            '}');
+        bt(
+            'var a = a,\n' +
+            '    /* c */\n' +
+            '    b;');
+        bt(
+            'var a = a,\n' +
+            '    // c\n' +
+            '    b;');
         
         // weird element referencing
         bt('foo.("bar");');
-        bt('if (a) a()\nelse b()\nnewline()');
-        bt('if (a) a()\nnewline()');
+        bt(
+            'if (a) a()\n' +
+            'else b()\n' +
+            'newline()');
+        bt(
+            'if (a) a()\n' +
+            'newline()');
         bt('a=typeof(x)', 'a = typeof(x)');
-        bt('var a = function() {\n        return null;\n    },\n    b = false;');
-        bt('var a = function() {\n    func1()\n}');
-        bt('var a = function() {\n    func1()\n}\nvar b = function() {\n    func2()\n}');
+        bt(
+            'var a = function() {\n' +
+            '        return null;\n' +
+            '    },\n' +
+            '    b = false;');
+        bt(
+            'var a = function() {\n' +
+            '    func1()\n' +
+            '}');
+        bt(
+            'var a = function() {\n' +
+            '    func1()\n' +
+            '}\n' +
+            'var b = function() {\n' +
+            '    func2()\n' +
+            '}');
         
         // code with and without semicolons
         bt(
-            'var whatever = require("whatever");\nfunction() {\n    a = 6;\n}',
-            'var whatever = require("whatever");\n\nfunction() {\n    a = 6;\n}');
-        bt('var whatever = require("whatever")\nfunction() {\n    a = 6\n}', 'var whatever = require("whatever")\n\nfunction() {\n    a = 6\n}');
-        bt('{"x":[{"a":1,"b":3},\n7,8,8,8,8,{"b":99},{"a":11}]}', '{\n    "x": [{\n            "a": 1,\n            "b": 3\n        },\n        7, 8, 8, 8, 8, {\n            "b": 99\n        }, {\n            "a": 11\n        }\n    ]\n}');
-        bt('{"x":[{"a":1,"b":3},7,8,8,8,8,{"b":99},{"a":11}]}', '{\n    "x": [{\n        "a": 1,\n        "b": 3\n    }, 7, 8, 8, 8, 8, {\n        "b": 99\n    }, {\n        "a": 11\n    }]\n}');
-        bt('{"1":{"1a":"1b"},"2"}', '{\n    "1": {\n        "1a": "1b"\n    },\n    "2"\n}');
-        bt('{a:{a:b},c}', '{\n    a: {\n        a: b\n    },\n    c\n}');
-        bt('{[y[a]];keep_indent;}', '{\n    [y[a]];\n    keep_indent;\n}');
-        bt('if (x) {y} else { if (x) {y}}', 'if (x) {\n    y\n} else {\n    if (x) {\n        y\n    }\n}');
-        bt('if (foo) one()\ntwo()\nthree()');
-        bt('if (1 + foo() && bar(baz()) / 2) one()\ntwo()\nthree()');
-        bt('if (1 + foo() && bar(baz()) / 2) one();\ntwo();\nthree();');
-        bt('var a=1,b={bang:2},c=3;', 'var a = 1,\n    b = {\n        bang: 2\n    },\n    c = 3;');
-        bt('var a={bing:1},b=2,c=3;', 'var a = {\n        bing: 1\n    },\n    b = 2,\n    c = 3;');
+            'var whatever = require("whatever");\n' +
+            'function() {\n' +
+            '    a = 6;\n' +
+            '}',
+            //  -- output --
+            'var whatever = require("whatever");\n' +
+            '\n' +
+            'function() {\n' +
+            '    a = 6;\n' +
+            '}');
+        bt(
+            'var whatever = require("whatever")\n' +
+            'function() {\n' +
+            '    a = 6\n' +
+            '}',
+            //  -- output --
+            'var whatever = require("whatever")\n' +
+            '\n' +
+            'function() {\n' +
+            '    a = 6\n' +
+            '}');
+        bt(
+            '{"x":[{"a":1,"b":3},\n' +
+            '7,8,8,8,8,{"b":99},{"a":11}]}',
+            //  -- output --
+            '{\n' +
+            '    "x": [{\n' +
+            '            "a": 1,\n' +
+            '            "b": 3\n' +
+            '        },\n' +
+            '        7, 8, 8, 8, 8, {\n' +
+            '            "b": 99\n' +
+            '        }, {\n' +
+            '            "a": 11\n' +
+            '        }\n' +
+            '    ]\n' +
+            '}');
+        bt(
+            '{"x":[{"a":1,"b":3},7,8,8,8,8,{"b":99},{"a":11}]}',
+            //  -- output --
+            '{\n' +
+            '    "x": [{\n' +
+            '        "a": 1,\n' +
+            '        "b": 3\n' +
+            '    }, 7, 8, 8, 8, 8, {\n' +
+            '        "b": 99\n' +
+            '    }, {\n' +
+            '        "a": 11\n' +
+            '    }]\n' +
+            '}');
+        bt(
+            '{"1":{"1a":"1b"},"2"}',
+            //  -- output --
+            '{\n' +
+            '    "1": {\n' +
+            '        "1a": "1b"\n' +
+            '    },\n' +
+            '    "2"\n' +
+            '}');
+        bt(
+            '{a:{a:b},c}',
+            //  -- output --
+            '{\n' +
+            '    a: {\n' +
+            '        a: b\n' +
+            '    },\n' +
+            '    c\n' +
+            '}');
+        bt(
+            '{[y[a]];keep_indent;}',
+            //  -- output --
+            '{\n' +
+            '    [y[a]];\n' +
+            '    keep_indent;\n' +
+            '}');
+        bt(
+            'if (x) {y} else { if (x) {y}}',
+            //  -- output --
+            'if (x) {\n' +
+            '    y\n' +
+            '} else {\n' +
+            '    if (x) {\n' +
+            '        y\n' +
+            '    }\n' +
+            '}');
+        bt(
+            'if (foo) one()\n' +
+            'two()\n' +
+            'three()');
+        bt(
+            'if (1 + foo() && bar(baz()) / 2) one()\n' +
+            'two()\n' +
+            'three()');
+        bt(
+            'if (1 + foo() && bar(baz()) / 2) one();\n' +
+            'two();\n' +
+            'three();');
+        bt(
+            'var a=1,b={bang:2},c=3;',
+            //  -- output --
+            'var a = 1,\n' +
+            '    b = {\n' +
+            '        bang: 2\n' +
+            '    },\n' +
+            '    c = 3;');
+        bt(
+            'var a={bing:1},b=2,c=3;',
+            //  -- output --
+            'var a = {\n' +
+            '        bing: 1\n' +
+            '    },\n' +
+            '    b = 2,\n' +
+            '    c = 3;');
 
 
     }
diff --git a/python/cssbeautifier/tests/generated/tests.py b/python/cssbeautifier/tests/generated/tests.py
index 2d7224ebf..d27a4569c 100644
--- a/python/cssbeautifier/tests/generated/tests.py
+++ b/python/cssbeautifier/tests/generated/tests.py
@@ -81,7 +81,15 @@ def testGenerated(self):
         self.options.end_with_newline = true
         test_fragment('', '\n')
         test_fragment('   .tabs{}', '   .tabs {}\n')
-        test_fragment('   \n\n.tabs{}\n\n\n\n', '   .tabs {}\n')
+        test_fragment(
+            '   \n' +
+            '\n' +
+            '.tabs{}\n' +
+            '\n' +
+            '\n' +
+            '\n',
+            #  -- output --
+            '   .tabs {}\n')
         test_fragment('\n')
 
         # End With Newline - (eof = "")
@@ -89,7 +97,15 @@ def testGenerated(self):
         self.options.end_with_newline = false
         test_fragment('')
         test_fragment('   .tabs{}', '   .tabs {}')
-        test_fragment('   \n\n.tabs{}\n\n\n\n', '   .tabs {}')
+        test_fragment(
+            '   \n' +
+            '\n' +
+            '.tabs{}\n' +
+            '\n' +
+            '\n' +
+            '\n',
+            #  -- output --
+            '   .tabs {}')
         test_fragment('\n', '')
 
 
@@ -99,13 +115,30 @@ def testGenerated(self):
         t('.tabs{}', '.tabs {}')
         t('.tabs { }', '.tabs {}')
         t('.tabs    {    }', '.tabs {}')
-        t('.tabs    \n{\n    \n  }', '.tabs {}')
+        t(
+            '.tabs    \n' +
+            '{\n' +
+            '    \n' +
+            '  }',
+            #  -- output --
+            '.tabs {}')
 
 
         #============================================================
         # 
         self.reset_options();
-        t('#cboxOverlay {\n\tbackground: url(images/overlay.png) repeat 0 0;\n\topacity: 0.9;\n\tfilter: alpha(opacity = 90);\n}', '#cboxOverlay {\n\tbackground: url(images/overlay.png) repeat 0 0;\n\topacity: 0.9;\n\tfilter: alpha(opacity=90);\n}')
+        t(
+            '#cboxOverlay {\n' +
+            '\tbackground: url(images/overlay.png) repeat 0 0;\n' +
+            '\topacity: 0.9;\n' +
+            '\tfilter: alpha(opacity = 90);\n' +
+            '}',
+            #  -- output --
+            '#cboxOverlay {\n' +
+            '\tbackground: url(images/overlay.png) repeat 0 0;\n' +
+            '\topacity: 0.9;\n' +
+            '\tfilter: alpha(opacity=90);\n' +
+            '}')
 
 
         #============================================================
@@ -157,21 +190,25 @@ def testGenerated(self):
         t('a + b > c{}', 'a + b > c {}')
         t(
             'a > b{width: calc(100% + 45px);}',
+            #  -- output --
             'a > b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a ~ b{width: calc(100% + 45px);}',
+            #  -- output --
             'a ~ b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a + b{width: calc(100% + 45px);}',
+            #  -- output --
             'a + b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a + b > c{width: calc(100% + 45px);}',
+            #  -- output --
             'a + b > c {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
@@ -189,21 +226,25 @@ def testGenerated(self):
         t('a + b > c{}', 'a+b>c {}')
         t(
             'a > b{width: calc(100% + 45px);}',
+            #  -- output --
             'a>b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a ~ b{width: calc(100% + 45px);}',
+            #  -- output --
             'a~b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a + b{width: calc(100% + 45px);}',
+            #  -- output --
             'a+b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a + b > c{width: calc(100% + 45px);}',
+            #  -- output --
             'a+b>c {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
@@ -221,21 +262,25 @@ def testGenerated(self):
         t('a + b > c{}', 'a + b > c {}')
         t(
             'a > b{width: calc(100% + 45px);}',
+            #  -- output --
             'a > b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a ~ b{width: calc(100% + 45px);}',
+            #  -- output --
             'a ~ b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a + b{width: calc(100% + 45px);}',
+            #  -- output --
             'a + b {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
         t(
             'a + b > c{width: calc(100% + 45px);}',
+            #  -- output --
             'a + b > c {\n' +
             '\twidth: calc(100% + 45px);\n' +
             '}')
@@ -246,41 +291,153 @@ def testGenerated(self):
         self.reset_options();
         self.options.selector_separator_newline = false
         self.options.selector_separator = " "
-        t('#bla, #foo{color:green}', '#bla, #foo {\n\tcolor: green\n}')
-        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}')
-        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab, .bat {}\n}')
-        t('#bla, #foo{color:black}', '#bla, #foo {\n\tcolor: black\n}')
-        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child, a:first-child {\n\tcolor: red;\n\tdiv:first-child, div:hover {\n\t\tcolor: black;\n\t}\n}')
+        t(
+            '#bla, #foo{color:green}',
+            #  -- output --
+            '#bla, #foo {\n' +
+            '\tcolor: green\n' +
+            '}')
+        t(
+            '@media print {.tab{}}',
+            #  -- output --
+            '@media print {\n' +
+            '\t.tab {}\n' +
+            '}')
+        t(
+            '@media print {.tab,.bat{}}',
+            #  -- output --
+            '@media print {\n' +
+            '\t.tab, .bat {}\n' +
+            '}')
+        t(
+            '#bla, #foo{color:black}',
+            #  -- output --
+            '#bla, #foo {\n' +
+            '\tcolor: black\n' +
+            '}')
+        t(
+            'a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}',
+            #  -- output --
+            'a:first-child, a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child, div:hover {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}')
 
         # Selector Separator - (separator = " ", separator1 = " ")
         self.reset_options();
         self.options.selector_separator_newline = false
         self.options.selector_separator = "  "
-        t('#bla, #foo{color:green}', '#bla, #foo {\n\tcolor: green\n}')
-        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}')
-        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab, .bat {}\n}')
-        t('#bla, #foo{color:black}', '#bla, #foo {\n\tcolor: black\n}')
-        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child, a:first-child {\n\tcolor: red;\n\tdiv:first-child, div:hover {\n\t\tcolor: black;\n\t}\n}')
+        t(
+            '#bla, #foo{color:green}',
+            #  -- output --
+            '#bla, #foo {\n' +
+            '\tcolor: green\n' +
+            '}')
+        t(
+            '@media print {.tab{}}',
+            #  -- output --
+            '@media print {\n' +
+            '\t.tab {}\n' +
+            '}')
+        t(
+            '@media print {.tab,.bat{}}',
+            #  -- output --
+            '@media print {\n' +
+            '\t.tab, .bat {}\n' +
+            '}')
+        t(
+            '#bla, #foo{color:black}',
+            #  -- output --
+            '#bla, #foo {\n' +
+            '\tcolor: black\n' +
+            '}')
+        t(
+            'a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}',
+            #  -- output --
+            'a:first-child, a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child, div:hover {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}')
 
         # Selector Separator - (separator = "\n", separator1 = "\n\t")
         self.reset_options();
         self.options.selector_separator_newline = true
         self.options.selector_separator = " "
-        t('#bla, #foo{color:green}', '#bla,\n#foo {\n\tcolor: green\n}')
-        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}')
-        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab,\n\t.bat {}\n}')
-        t('#bla, #foo{color:black}', '#bla,\n#foo {\n\tcolor: black\n}')
-        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child,\na:first-child {\n\tcolor: red;\n\tdiv:first-child,\n\tdiv:hover {\n\t\tcolor: black;\n\t}\n}')
+        t(
+            '#bla, #foo{color:green}',
+            #  -- output --
+            '#bla,\n#foo {\n' +
+            '\tcolor: green\n' +
+            '}')
+        t(
+            '@media print {.tab{}}',
+            #  -- output --
+            '@media print {\n' +
+            '\t.tab {}\n' +
+            '}')
+        t(
+            '@media print {.tab,.bat{}}',
+            #  -- output --
+            '@media print {\n' +
+            '\t.tab,\n\t.bat {}\n' +
+            '}')
+        t(
+            '#bla, #foo{color:black}',
+            #  -- output --
+            '#bla,\n#foo {\n' +
+            '\tcolor: black\n' +
+            '}')
+        t(
+            'a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}',
+            #  -- output --
+            'a:first-child,\na:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child,\n\tdiv:hover {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}')
 
         # Selector Separator - (separator = "\n", separator1 = "\n\t")
         self.reset_options();
         self.options.selector_separator_newline = true
         self.options.selector_separator = "  "
-        t('#bla, #foo{color:green}', '#bla,\n#foo {\n\tcolor: green\n}')
-        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}')
-        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab,\n\t.bat {}\n}')
-        t('#bla, #foo{color:black}', '#bla,\n#foo {\n\tcolor: black\n}')
-        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child,\na:first-child {\n\tcolor: red;\n\tdiv:first-child,\n\tdiv:hover {\n\t\tcolor: black;\n\t}\n}')
+        t(
+            '#bla, #foo{color:green}',
+            #  -- output --
+            '#bla,\n#foo {\n' +
+            '\tcolor: green\n' +
+            '}')
+        t(
+            '@media print {.tab{}}',
+            #  -- output --
+            '@media print {\n' +
+            '\t.tab {}\n' +
+            '}')
+        t(
+            '@media print {.tab,.bat{}}',
+            #  -- output --
+            '@media print {\n' +
+            '\t.tab,\n\t.bat {}\n' +
+            '}')
+        t(
+            '#bla, #foo{color:black}',
+            #  -- output --
+            '#bla,\n#foo {\n' +
+            '\tcolor: black\n' +
+            '}')
+        t(
+            'a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}',
+            #  -- output --
+            'a:first-child,\na:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child,\n\tdiv:hover {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}')
 
 
         #============================================================
@@ -288,52 +445,378 @@ def testGenerated(self):
         self.reset_options();
         self.options.preserve_newlines = true
         t('.div {}\n\n.span {}')
-        t('#bla, #foo{\n\tcolor:black;\n\n\tfont-size: 12px;\n}', '#bla,\n#foo {\n\tcolor: black;\n\n\tfont-size: 12px;\n}')
+        t(
+            '#bla, #foo{\n' +
+            '\tcolor:black;\n\n\tfont-size: 12px;\n' +
+            '}',
+            #  -- output --
+            '#bla,\n' +
+            '#foo {\n' +
+            '\tcolor: black;\n\n\tfont-size: 12px;\n' +
+            '}')
 
         # Preserve Newlines - (separator_input = "\n\n", separator_output = "\n")
         self.reset_options();
         self.options.preserve_newlines = false
         t('.div {}\n\n.span {}', '.div {}\n.span {}')
-        t('#bla, #foo{\n\tcolor:black;\n\n\tfont-size: 12px;\n}', '#bla,\n#foo {\n\tcolor: black;\n\tfont-size: 12px;\n}')
+        t(
+            '#bla, #foo{\n' +
+            '\tcolor:black;\n\n\tfont-size: 12px;\n' +
+            '}',
+            #  -- output --
+            '#bla,\n' +
+            '#foo {\n' +
+            '\tcolor: black;\n\tfont-size: 12px;\n' +
+            '}')
 
 
         #============================================================
         # Preserve Newlines and add tabs
         self.reset_options();
         self.options.preserve_newlines = true
-        t('.tool-tip {\n\tposition: relative;\n\n\t\t\n\t.tool-tip-content {\n\t\t&>* {\n\t\t\tmargin-top: 0;\n\t\t}\n\t\t\n\n\t\t.mixin-box-shadow(.2rem .2rem .5rem rgba(0, 0, 0, .15));\n\t\tpadding: 1rem;\n\t\tposition: absolute;\n\t\tz-index: 10;\n\t}\n}', '.tool-tip {\n\tposition: relative;\n\n\n\t.tool-tip-content {\n\t\t&>* {\n\t\t\tmargin-top: 0;\n\t\t}\n\n\n\t\t.mixin-box-shadow(.2rem .2rem .5rem rgba(0, 0, 0, .15));\n\t\tpadding: 1rem;\n\t\tposition: absolute;\n\t\tz-index: 10;\n\t}\n}')
+        t(
+            '.tool-tip {\n' +
+            '\tposition: relative;\n' +
+            '\n' +
+            '\t\t\n' +
+            '\t.tool-tip-content {\n' +
+            '\t\t&>* {\n' +
+            '\t\t\tmargin-top: 0;\n' +
+            '\t\t}\n' +
+            '\t\t\n' +
+            '\n' +
+            '\t\t.mixin-box-shadow(.2rem .2rem .5rem rgba(0, 0, 0, .15));\n' +
+            '\t\tpadding: 1rem;\n' +
+            '\t\tposition: absolute;\n' +
+            '\t\tz-index: 10;\n' +
+            '\t}\n' +
+            '}',
+            #  -- output --
+            '.tool-tip {\n' +
+            '\tposition: relative;\n' +
+            '\n' +
+            '\n' +
+            '\t.tool-tip-content {\n' +
+            '\t\t&>* {\n' +
+            '\t\t\tmargin-top: 0;\n' +
+            '\t\t}\n' +
+            '\n\n\t\t.mixin-box-shadow(.2rem .2rem .5rem rgba(0, 0, 0, .15));\n' +
+            '\t\tpadding: 1rem;\n' +
+            '\t\tposition: absolute;\n' +
+            '\t\tz-index: 10;\n' +
+            '\t}\n' +
+            '}')
 
 
         #============================================================
         # Newline Between Rules - (separator = "\n")
         self.reset_options();
         self.options.newline_between_rules = true
-        t('.div {}\n.span {}', '.div {}\n\n.span {}')
-        t('.div{}\n   \n.span{}', '.div {}\n\n.span {}')
-        t('.div {}    \n  \n.span { } \n', '.div {}\n\n.span {}')
-        t('.div {\n    \n} \n  .span {\n }  ', '.div {}\n\n.span {}')
-        t('.selector1 {\n\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n}\n.div{height:15px;}', '.selector1 {\n\tmargin: 0;\n\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n}\n\n.div {\n\theight: 15px;\n}')
-        t('.tabs{width:10px;//end of line comment\nheight:10px;//another\n}\n.div{height:15px;}', '.tabs {\n\twidth: 10px; //end of line comment\n\theight: 10px; //another\n}\n\n.div {\n\theight: 15px;\n}')
-        t('#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n\n.div {\n\theight: 15px;\n}')
-        t('@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n\n.div {\n\theight: 15px;\n}')
-        t('@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}', '@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}')
-        t('a:first-child{color:red;div:first-child{color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:first-child {\n\t\tcolor: black;\n\t}\n}\n\n.div {\n\theight: 15px;\n}')
-        t('a:first-child{color:red;div:not(.peq){color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:not(.peq) {\n\t\tcolor: black;\n\t}\n}\n\n.div {\n\theight: 15px;\n}')
+        t(
+            '.div {}\n' +
+            '.span {}',
+            #  -- output --
+            '.div {}\n' +
+            '\n.span {}')
+        t(
+            '.div{}\n' +
+            '   \n' +
+            '.span{}',
+            #  -- output --
+            '.div {}\n' +
+            '\n.span {}')
+        t(
+            '.div {}    \n' +
+            '  \n' +
+            '.span { } \n',
+            #  -- output --
+            '.div {}\n' +
+            '\n.span {}')
+        t(
+            '.div {\n' +
+            '    \n' +
+            '} \n' +
+            '  .span {\n' +
+            ' }  ',
+            #  -- output --
+            '.div {}\n' +
+            '\n.span {}')
+        t(
+            '.selector1 {\n' +
+            '\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            '.selector1 {\n' +
+            '\tmargin: 0;\n' +
+            '\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            'height:10px;//another\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '\theight: 10px; //another\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            '#foo {\n' +
+            '\tbackground-image: url(foo@2x.png);\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            '#foo {\n' +
+            '\tbackground-image: url(foo@2x.png);\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t}\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t}\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            '@font-face {\n' +
+            '\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '}\n' +
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo.png);\n' +
+            '\t}\n' +
+            '\t@media screen and (min-device-pixel-ratio: 2) {\n' +
+            '\t\t@font-face {\n' +
+            '\t\t\tfont-family: "Helvetica Neue"\n' +
+            '\t\t}\n' +
+            '\t\t#foo:hover {\n' +
+            '\t\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t\t}\n' +
+            '\t}\n' +
+            '}',
+            #  -- output --
+            '@font-face {\n' +
+            '\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '}\n' +
+            '\n@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo.png);\n' +
+            '\t}\n' +
+            '\t@media screen and (min-device-pixel-ratio: 2) {\n' +
+            '\t\t@font-face {\n' +
+            '\t\t\tfont-family: "Helvetica Neue"\n' +
+            '\t\t}\n' +
+            '\t\t#foo:hover {\n' +
+            '\t\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t\t}\n' +
+            '\t}\n' +
+            '}')
+        t(
+            'a:first-child{color:red;div:first-child{color:black;}}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            'a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            'a:first-child{color:red;div:not(.peq){color:black;}}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            'a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:not(.peq) {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}\n' +
+            '\n.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
 
         # Newline Between Rules - (separator = "")
         self.reset_options();
         self.options.newline_between_rules = false
-        t('.div {}\n.span {}')
-        t('.div{}\n   \n.span{}', '.div {}\n.span {}')
-        t('.div {}    \n  \n.span { } \n', '.div {}\n.span {}')
-        t('.div {\n    \n} \n  .span {\n }  ', '.div {}\n.span {}')
-        t('.selector1 {\n\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n}\n.div{height:15px;}', '.selector1 {\n\tmargin: 0;\n\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n}\n.div {\n\theight: 15px;\n}')
-        t('.tabs{width:10px;//end of line comment\nheight:10px;//another\n}\n.div{height:15px;}', '.tabs {\n\twidth: 10px; //end of line comment\n\theight: 10px; //another\n}\n.div {\n\theight: 15px;\n}')
-        t('#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div {\n\theight: 15px;\n}')
-        t('@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div {\n\theight: 15px;\n}')
-        t('@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}')
-        t('a:first-child{color:red;div:first-child{color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:first-child {\n\t\tcolor: black;\n\t}\n}\n.div {\n\theight: 15px;\n}')
-        t('a:first-child{color:red;div:not(.peq){color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:not(.peq) {\n\t\tcolor: black;\n\t}\n}\n.div {\n\theight: 15px;\n}')
+        t(
+            '.div {}\n' +
+            '.span {}')
+        t(
+            '.div{}\n' +
+            '   \n' +
+            '.span{}',
+            #  -- output --
+            '.div {}\n' +
+            '.span {}')
+        t(
+            '.div {}    \n' +
+            '  \n' +
+            '.span { } \n',
+            #  -- output --
+            '.div {}\n' +
+            '.span {}')
+        t(
+            '.div {\n' +
+            '    \n' +
+            '} \n' +
+            '  .span {\n' +
+            ' }  ',
+            #  -- output --
+            '.div {}\n' +
+            '.span {}')
+        t(
+            '.selector1 {\n' +
+            '\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            '.selector1 {\n' +
+            '\tmargin: 0;\n' +
+            '\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            'height:10px;//another\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '\theight: 10px; //another\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            '#foo {\n' +
+            '\tbackground-image: url(foo@2x.png);\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            '#foo {\n' +
+            '\tbackground-image: url(foo@2x.png);\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t}\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t}\n' +
+            '\t@font-face {\n' +
+            '\t\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            '@font-face {\n' +
+            '\tfont-family: "Bitstream Vera Serif Bold";\n' +
+            '\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n' +
+            '}\n' +
+            '@media screen {\n' +
+            '\t#foo:hover {\n' +
+            '\t\tbackground-image: url(foo.png);\n' +
+            '\t}\n' +
+            '\t@media screen and (min-device-pixel-ratio: 2) {\n' +
+            '\t\t@font-face {\n' +
+            '\t\t\tfont-family: "Helvetica Neue"\n' +
+            '\t\t}\n' +
+            '\t\t#foo:hover {\n' +
+            '\t\t\tbackground-image: url(foo@2x.png);\n' +
+            '\t\t}\n' +
+            '\t}\n' +
+            '}')
+        t(
+            'a:first-child{color:red;div:first-child{color:black;}}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            'a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:first-child {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
+        t(
+            'a:first-child{color:red;div:not(.peq){color:black;}}\n' +
+            '.div{height:15px;}',
+            #  -- output --
+            'a:first-child {\n' +
+            '\tcolor: red;\n' +
+            '\tdiv:not(.peq) {\n' +
+            '\t\tcolor: black;\n' +
+            '\t}\n' +
+            '}\n' +
+            '.div {\n' +
+            '\theight: 15px;\n' +
+            '}')
 
 
         #============================================================
@@ -341,54 +824,200 @@ def testGenerated(self):
         self.reset_options();
         t('.tabs(){}', '.tabs() {}')
         t('.tabs (){}', '.tabs () {}')
-        t('.tabs (pa, pa(1,2)), .cols { }', '.tabs (pa, pa(1, 2)),\n.cols {}')
-        t('.tabs(pa, pa(1,2)), .cols { }', '.tabs(pa, pa(1, 2)),\n.cols {}')
+        t(
+            '.tabs (pa, pa(1,2)), .cols { }',
+            #  -- output --
+            '.tabs (pa, pa(1, 2)),\n' +
+            '.cols {}')
+        t(
+            '.tabs(pa, pa(1,2)), .cols { }',
+            #  -- output --
+            '.tabs(pa, pa(1, 2)),\n' +
+            '.cols {}')
         t('.tabs (   )   {    }', '.tabs () {}')
         t('.tabs(   )   {    }', '.tabs() {}')
-        t('.tabs  (t, t2)  \n{\n  key: val(p1  ,p2);  \n  }', '.tabs (t, t2) {\n\tkey: val(p1, p2);\n}')
-        t('.box-shadow(@shadow: 0 1px 3px rgba(0, 0, 0, .25)) {\n\t-webkit-box-shadow: @shadow;\n\t-moz-box-shadow: @shadow;\n\tbox-shadow: @shadow;\n}')
+        t(
+            '.tabs  (t, t2)  \n' +
+            '{\n' +
+            '  key: val(p1  ,p2);  \n' +
+            '  }',
+            #  -- output --
+            '.tabs (t, t2) {\n' +
+            '\tkey: val(p1, p2);\n' +
+            '}')
+        t(
+            '.box-shadow(@shadow: 0 1px 3px rgba(0, 0, 0, .25)) {\n' +
+            '\t-webkit-box-shadow: @shadow;\n' +
+            '\t-moz-box-shadow: @shadow;\n' +
+            '\tbox-shadow: @shadow;\n' +
+            '}')
 
 
         #============================================================
         # Comments
         self.reset_options();
         t('/* test */')
-        t('.tabs{/* test */}', '.tabs {\n\t/* test */\n}')
-        t('.tabs{/* test */}', '.tabs {\n\t/* test */\n}')
-        t('/* header */.tabs {}', '/* header */\n\n.tabs {}')
-        t('.tabs {\n/* non-header */\nwidth:10px;}', '.tabs {\n\t/* non-header */\n\twidth: 10px;\n}')
+        t(
+            '.tabs{/* test */}',
+            #  -- output --
+            '.tabs {\n' +
+            '\t/* test */\n' +
+            '}')
+        t(
+            '.tabs{/* test */}',
+            #  -- output --
+            '.tabs {\n' +
+            '\t/* test */\n' +
+            '}')
+        t(
+            '/* header */.tabs {}',
+            #  -- output --
+            '/* header */\n' +
+            '\n' +
+            '.tabs {}')
+        t(
+            '.tabs {\n' +
+            '/* non-header */\n' +
+            'width:10px;}',
+            #  -- output --
+            '.tabs {\n' +
+            '\t/* non-header */\n' +
+            '\twidth: 10px;\n' +
+            '}')
         t('/* header')
         t('// comment')
-        t('.selector1 {\n\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n}', '.selector1 {\n\tmargin: 0;\n\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n}')
+        t(
+            '.selector1 {\n' +
+            '\tmargin: 0; /* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}',
+            #  -- output --
+            '.selector1 {\n' +
+            '\tmargin: 0;\n' +
+            '\t/* This is a comment including an url http://domain.com/path/to/file.ext */\n' +
+            '}')
         
         # single line comment support (less/sass)
-        t('.tabs{\n// comment\nwidth:10px;\n}', '.tabs {\n\t// comment\n\twidth: 10px;\n}')
-        t('.tabs{// comment\nwidth:10px;\n}', '.tabs {\n\t// comment\n\twidth: 10px;\n}')
-        t('//comment\n.tabs{width:10px;}', '//comment\n.tabs {\n\twidth: 10px;\n}')
-        t('.tabs{//comment\n//2nd single line comment\nwidth:10px;}', '.tabs {\n\t//comment\n\t//2nd single line comment\n\twidth: 10px;\n}')
-        t('.tabs{width:10px;//end of line comment\n}', '.tabs {\n\twidth: 10px; //end of line comment\n}')
-        t('.tabs{width:10px;//end of line comment\nheight:10px;}', '.tabs {\n\twidth: 10px; //end of line comment\n\theight: 10px;\n}')
-        t('.tabs{width:10px;//end of line comment\nheight:10px;//another\n}', '.tabs {\n\twidth: 10px; //end of line comment\n\theight: 10px; //another\n}')
+        t(
+            '.tabs{\n' +
+            '// comment\n' +
+            'width:10px;\n' +
+            '}',
+            #  -- output --
+            '.tabs {\n' +
+            '\t// comment\n' +
+            '\twidth: 10px;\n' +
+            '}')
+        t(
+            '.tabs{// comment\n' +
+            'width:10px;\n' +
+            '}',
+            #  -- output --
+            '.tabs {\n' +
+            '\t// comment\n' +
+            '\twidth: 10px;\n' +
+            '}')
+        t(
+            '//comment\n' +
+            '.tabs{width:10px;}',
+            #  -- output --
+            '//comment\n' +
+            '.tabs {\n' +
+            '\twidth: 10px;\n' +
+            '}')
+        t(
+            '.tabs{//comment\n' +
+            '//2nd single line comment\n' +
+            'width:10px;}',
+            #  -- output --
+            '.tabs {\n' +
+            '\t//comment\n' +
+            '\t//2nd single line comment\n' +
+            '\twidth: 10px;\n' +
+            '}')
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            '}',
+            #  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '}')
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            'height:10px;}',
+            #  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '\theight: 10px;\n' +
+            '}')
+        t(
+            '.tabs{width:10px;//end of line comment\n' +
+            'height:10px;//another\n' +
+            '}',
+            #  -- output --
+            '.tabs {\n' +
+            '\twidth: 10px; //end of line comment\n' +
+            '\theight: 10px; //another\n' +
+            '}')
 
 
         #============================================================
         # Handle LESS property name interpolation
         self.reset_options();
-        t('tag {\n\t@{prop}: none;\n}')
-        t('tag{@{prop}:none;}', 'tag {\n\t@{prop}: none;\n}')
-        t('tag{ @{prop}: none;}', 'tag {\n\t@{prop}: none;\n}')
+        t(
+            'tag {\n' +
+            '\t@{prop}: none;\n' +
+            '}')
+        t(
+            'tag{@{prop}:none;}',
+            #  -- output --
+            'tag {\n' +
+            '\t@{prop}: none;\n' +
+            '}')
+        t(
+            'tag{ @{prop}: none;}',
+            #  -- output --
+            'tag {\n' +
+            '\t@{prop}: none;\n' +
+            '}')
         
         # can also be part of property name
-        t('tag {\n\tdynamic-@{prop}: none;\n}')
-        t('tag{dynamic-@{prop}:none;}', 'tag {\n\tdynamic-@{prop}: none;\n}')
-        t('tag{ dynamic-@{prop}: none;}', 'tag {\n\tdynamic-@{prop}: none;\n}')
+        t(
+            'tag {\n' +
+            '\tdynamic-@{prop}: none;\n' +
+            '}')
+        t(
+            'tag{dynamic-@{prop}:none;}',
+            #  -- output --
+            'tag {\n' +
+            '\tdynamic-@{prop}: none;\n' +
+            '}')
+        t(
+            'tag{ dynamic-@{prop}: none;}',
+            #  -- output --
+            'tag {\n' +
+            '\tdynamic-@{prop}: none;\n' +
+            '}')
 
 
         #============================================================
         # Handle LESS property name interpolation, test #631
         self.reset_options();
-        t('.generate-columns(@n, @i: 1) when (@i =< @n) {\n\t.column-@{i} {\n\t\twidth: (@i * 100% / @n);\n\t}\n\t.generate-columns(@n, (@i + 1));\n}')
-        t('.generate-columns(@n,@i:1) when (@i =< @n){.column-@{i}{width:(@i * 100% / @n);}.generate-columns(@n,(@i + 1));}', '.generate-columns(@n, @i: 1) when (@i =< @n) {\n\t.column-@{i} {\n\t\twidth: (@i * 100% / @n);\n\t}\n\t.generate-columns(@n, (@i + 1));\n}')
+        t(
+            '.generate-columns(@n, @i: 1) when (@i =< @n) {\n' +
+            '\t.column-@{i} {\n' +
+            '\t\twidth: (@i * 100% / @n);\n' +
+            '\t}\n' +
+            '\t.generate-columns(@n, (@i + 1));\n' +
+            '}')
+        t(
+            '.generate-columns(@n,@i:1) when (@i =< @n){.column-@{i}{width:(@i * 100% / @n);}.generate-columns(@n,(@i + 1));}',
+            #  -- output --
+            '.generate-columns(@n, @i: 1) when (@i =< @n) {\n' +
+            '\t.column-@{i} {\n' +
+            '\t\twidth: (@i * 100% / @n);\n' +
+            '\t}\n' +
+            '\t.generate-columns(@n, (@i + 1));\n' +
+            '}')
 
 
         #============================================================
@@ -406,7 +1035,12 @@ def testGenerated(self):
         self.reset_options();
         
         # Basic Interpolation
-        t('p {\n\t$font-size: 12px;\n\t$line-height: 30px;\n\tfont: #{$font-size}/#{$line-height};\n}')
+        t(
+            'p {\n' +
+            '\t$font-size: 12px;\n' +
+            '\t$line-height: 30px;\n' +
+            '\tfont: #{$font-size}/#{$line-height};\n' +
+            '}')
         t('p.#{$name} {}')
         t(
             '@mixin itemPropertiesCoverItem($items, $margin) {\n' +
@@ -432,7 +1066,14 @@ def testGenerated(self):
         t('a ::b {}')
         t('a:b {}')
         t('a::b {}')
-        t('a {}, a::b {}, a   ::b {}, a:b {}, a   :b {}', 'a {}\n, a::b {}\n, a ::b {}\n, a:b {}\n, a :b {}')
+        t(
+            'a {}, a::b {}, a   ::b {}, a:b {}, a   :b {}',
+            #  -- output --
+            'a {}\n' +
+            ', a::b {}\n' +
+            ', a ::b {}\n' +
+            ', a:b {}\n' +
+            ', a :b {}')
         t(
             '.card-blue ::-webkit-input-placeholder {\n' +
             '\tcolor: #87D1FF;\n' +
diff --git a/python/jsbeautifier/tests/generated/tests.py b/python/jsbeautifier/tests/generated/tests.py
index ae57da41b..8269ca151 100644
--- a/python/jsbeautifier/tests/generated/tests.py
+++ b/python/jsbeautifier/tests/generated/tests.py
@@ -135,10 +135,22 @@ def unicode_char(value):
         # Test template and continuation strings
         self.reset_options();
         bt('`This is a ${template} string.`')
-        bt('`This\n  is\n  a\n  ${template}\n  string.`')
-        bt('a = `This is a continuation\\nstring.`')
-        bt('a = "This is a continuation\\nstring."')
-        bt('`SELECT\n  nextval(\'${this.options.schema ? `${this.options.schema}.` : \'\'}"${this.tableName}_${this.autoIncrementField}_seq"\'::regclass\n  ) nextval;`')
+        bt(
+            '`This\n' +
+            '  is\n' +
+            '  a\n' +
+            '  ${template}\n' +
+            '  string.`')
+        bt(
+            'a = `This is a continuation\\\n' +
+            'string.`')
+        bt(
+            'a = "This is a continuation\\\n' +
+            'string."')
+        bt(
+            '`SELECT\n' +
+            '  nextval(\'${this.options.schema ? `${this.options.schema}.` : \'\'}"${this.tableName}_${this.autoIncrementField}_seq"\'::regclass\n' +
+            '  ) nextval;`')
         
         # Tests for #1030
         bt(
@@ -181,7 +193,11 @@ def unicode_char(value):
         self.reset_options();
         self.options.brace_style = "collapse,preserve-inline"
         bt('const m = { ...item, c: 3 };')
-        bt('const m = {\n    ...item,\n    c: 3\n};')
+        bt(
+            'const m = {\n' +
+            '    ...item,\n' +
+            '    c: 3\n' +
+            '};')
         bt('const m = { c: 3, ...item };')
         bt('const m = [...item, 3];')
         bt('const m = [3, ...item];')
@@ -190,7 +206,12 @@ def unicode_char(value):
         #============================================================
         # Object literal shorthand functions
         self.reset_options();
-        bt('return {\n    foo() {\n        return 42;\n    }\n}')
+        bt(
+            'return {\n' +
+            '    foo() {\n' +
+            '        return 42;\n' +
+            '    }\n' +
+            '}')
         bt(
             'var foo = {\n' +
             '    * bar() {\n' +
@@ -199,6 +220,7 @@ def unicode_char(value):
             '};')
         bt(
             'var foo = {bar(){return 42;},*barGen(){yield 42;}};',
+            #  -- output --
             'var foo = {\n' +
             '    bar() {\n' +
             '        return 42;\n' +
@@ -237,7 +259,15 @@ def unicode_char(value):
         self.options.end_with_newline = true
         test_fragment('', '\n')
         test_fragment('   return .5', '   return .5\n')
-        test_fragment('   \n\nreturn .5\n\n\n\n', '   return .5\n')
+        test_fragment(
+            '   \n' +
+            '\n' +
+            'return .5\n' +
+            '\n' +
+            '\n' +
+            '\n',
+            #  -- output --
+            '   return .5\n')
         test_fragment('\n')
 
         # End With Newline - (eof = "")
@@ -245,7 +275,15 @@ def unicode_char(value):
         self.options.end_with_newline = false
         test_fragment('')
         test_fragment('   return .5')
-        test_fragment('   \n\nreturn .5\n\n\n\n', '   return .5')
+        test_fragment(
+            '   \n' +
+            '\n' +
+            'return .5\n' +
+            '\n' +
+            '\n' +
+            '\n',
+            #  -- output --
+            '   return .5')
         test_fragment('\n', '')
 
 
@@ -283,32 +321,88 @@ def unicode_char(value):
         # Brace style permutations - (ibo = "", iao = "", ibc = "", iac = "", obo = " ", oao = " ", obc = " ", oac = " ")
         self.reset_options();
         self.options.brace_style = 'collapse,preserve-inline'
-        bt('var a ={a: 2};\nvar a ={a: 2};', 'var a = { a: 2 };\nvar a = { a: 2 };')
-        bt('//case 1\nif (a == 1){}\n//case 2\nelse if (a == 2){}', '//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}')
+        bt(
+            'var a ={a: 2};\n' +
+            'var a ={a: 2};',
+            #  -- output --
+            'var a = { a: 2 };\n' +
+            'var a = { a: 2 };')
+        bt(
+            '//case 1\n' +
+            'if (a == 1){}\n' +
+            '//case 2\n' +
+            'else if (a == 2){}',
+            #  -- output --
+            '//case 1\n' +
+            'if (a == 1) {}\n' +
+            '//case 2\n' +
+            'else if (a == 2) {}')
         bt('if(1){2}else{3}', 'if (1) { 2 } else { 3 }')
         bt('try{a();}catch(b){c();}catch(d){}finally{e();}', 'try { a(); } catch (b) { c(); } catch (d) {} finally { e(); }')
 
         # Brace style permutations - (ibo = "\n", iao = "\n", ibc = "\n", iac = "\n", obo = " ", oao = "\n    ", obc = "\n", oac = " ")
         self.reset_options();
         self.options.brace_style = 'collapse,preserve-inline'
-        bt('var a =\n{\na: 2\n}\n;\nvar a =\n{\na: 2\n}\n;', 'var a = {\n    a: 2\n};\nvar a = {\n    a: 2\n};')
-        bt('//case 1\nif (a == 1)\n{}\n//case 2\nelse if (a == 2)\n{}', '//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}')
+        bt(
+            'var a =\n{\na: 2\n}\n;\n' +
+            'var a =\n{\na: 2\n}\n;',
+            #  -- output --
+            'var a = {\n    a: 2\n};\n' +
+            'var a = {\n    a: 2\n};')
+        bt(
+            '//case 1\n' +
+            'if (a == 1)\n{}\n' +
+            '//case 2\n' +
+            'else if (a == 2)\n{}',
+            #  -- output --
+            '//case 1\n' +
+            'if (a == 1) {}\n' +
+            '//case 2\n' +
+            'else if (a == 2) {}')
         bt('if(1)\n{\n2\n}\nelse\n{\n3\n}', 'if (1) {\n    2\n} else {\n    3\n}')
         bt('try\n{\na();\n}\ncatch(b)\n{\nc();\n}\ncatch(d)\n{}\nfinally\n{\ne();\n}', 'try {\n    a();\n} catch (b) {\n    c();\n} catch (d) {} finally {\n    e();\n}')
 
         # Brace style permutations - (ibo = "", iao = "", ibc = "", iac = "", obo = " ", oao = "\n    ", obc = "\n", oac = " ")
         self.reset_options();
         self.options.brace_style = 'collapse'
-        bt('var a ={a: 2};\nvar a ={a: 2};', 'var a = {\n    a: 2\n};\nvar a = {\n    a: 2\n};')
-        bt('//case 1\nif (a == 1){}\n//case 2\nelse if (a == 2){}', '//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}')
+        bt(
+            'var a ={a: 2};\n' +
+            'var a ={a: 2};',
+            #  -- output --
+            'var a = {\n    a: 2\n};\n' +
+            'var a = {\n    a: 2\n};')
+        bt(
+            '//case 1\n' +
+            'if (a == 1){}\n' +
+            '//case 2\n' +
+            'else if (a == 2){}',
+            #  -- output --
+            '//case 1\n' +
+            'if (a == 1) {}\n' +
+            '//case 2\n' +
+            'else if (a == 2) {}')
         bt('if(1){2}else{3}', 'if (1) {\n    2\n} else {\n    3\n}')
         bt('try{a();}catch(b){c();}catch(d){}finally{e();}', 'try {\n    a();\n} catch (b) {\n    c();\n} catch (d) {} finally {\n    e();\n}')
 
         # Brace style permutations - (ibo = "\n", iao = "\n", ibc = "\n", iac = "\n", obo = " ", oao = "\n    ", obc = "\n", oac = " ")
         self.reset_options();
         self.options.brace_style = 'collapse'
-        bt('var a =\n{\na: 2\n}\n;\nvar a =\n{\na: 2\n}\n;', 'var a = {\n    a: 2\n};\nvar a = {\n    a: 2\n};')
-        bt('//case 1\nif (a == 1)\n{}\n//case 2\nelse if (a == 2)\n{}', '//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}')
+        bt(
+            'var a =\n{\na: 2\n}\n;\n' +
+            'var a =\n{\na: 2\n}\n;',
+            #  -- output --
+            'var a = {\n    a: 2\n};\n' +
+            'var a = {\n    a: 2\n};')
+        bt(
+            '//case 1\n' +
+            'if (a == 1)\n{}\n' +
+            '//case 2\n' +
+            'else if (a == 2)\n{}',
+            #  -- output --
+            '//case 1\n' +
+            'if (a == 1) {}\n' +
+            '//case 2\n' +
+            'else if (a == 2) {}')
         bt('if(1)\n{\n2\n}\nelse\n{\n3\n}', 'if (1) {\n    2\n} else {\n    3\n}')
         bt('try\n{\na();\n}\ncatch(b)\n{\nc();\n}\ncatch(d)\n{}\nfinally\n{\ne();\n}', 'try {\n    a();\n} catch (b) {\n    c();\n} catch (d) {} finally {\n    e();\n}')
 
@@ -317,26 +411,88 @@ def unicode_char(value):
         # Comma-first option - (c0 = ",\n", c1 = ",\n    ", c2 = ",\n        ", c3 = ",\n            ", f1 = "    ,\n    ")
         self.reset_options();
         self.options.comma_first = false
-        bt('{a:1, b:2}', '{\n    a: 1,\n    b: 2\n}')
+        bt(
+            '{a:1, b:2}',
+            #  -- output --
+            '{\n' +
+            '    a: 1,\n    b: 2\n' +
+            '}')
         bt('var a=1, b=c[d], e=6;', 'var a = 1,\n    b = c[d],\n    e = 6;')
-        bt('for(var a=1,b=2,c=3;d<3;d++)\ne', 'for (var a = 1, b = 2, c = 3; d < 3; d++)\n    e')
-        bt('for(var a=1,b=2,\nc=3;d<3;d++)\ne', 'for (var a = 1, b = 2,\n        c = 3; d < 3; d++)\n    e')
-        bt('function foo() {\n    return [\n        "one",\n        "two"\n    ];\n}')
-        bt('a=[[1,2],[4,5],[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    [7, 8]\n]')
-        bt('a=[[1,2],[4,5],[7,8],]', 'a = [\n    [1, 2],\n    [4, 5],\n    [7, 8],\n]')
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]')
-        bt('a=[[1,2],[4,5],function(){},function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    function() {},\n    [7, 8]\n]')
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]')
+        bt(
+            'for(var a=1,b=2,c=3;d<3;d++)\n' +
+            'e',
+            #  -- output --
+            'for (var a = 1, b = 2, c = 3; d < 3; d++)\n' +
+            '    e')
+        bt(
+            'for(var a=1,b=2,\n' +
+            'c=3;d<3;d++)\n' +
+            'e',
+            #  -- output --
+            'for (var a = 1, b = 2,\n        c = 3; d < 3; d++)\n' +
+            '    e')
+        bt(
+            'function foo() {\n' +
+            '    return [\n' +
+            '        "one",\n        "two"\n' +
+            '    ];\n' +
+            '}')
+        bt(
+            'a=[[1,2],[4,5],[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],[7,8],]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    [7, 8],\n]')
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],function(){},function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    function() {},\n    function() {},\n    [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n' +
+            ']')
         bt('a=[b,c,function(){},function(){},d]', 'a = [b, c, function() {}, function() {}, d]')
-        bt('a=[b,c,\nfunction(){},function(){},d]', 'a = [b, c,\n    function() {},\n    function() {},\n    d\n]')
+        bt(
+            'a=[b,c,\n' +
+            'function(){},function(){},d]',
+            #  -- output --
+            'a = [b, c,\n    function() {},\n    function() {},\n    d\n' +
+            ']')
         bt('a=[a[1],b[4],c[d[7]]]', 'a = [a[1], b[4], c[d[7]]]')
         bt('[1,2,[3,4,[5,6],7],8]', '[1, 2, [3, 4, [5, 6], 7], 8]')
-        bt('[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]', '[\n    [\n        ["1", "2"],\n        ["3", "4"]\n    ],\n    [\n        ["5", "6", "7"],\n        ["8", "9", "0"]\n    ],\n    [\n        ["1", "2", "3"],\n        ["4", "5", "6", "7"],\n        ["8", "9", "0"]\n    ]\n]')
+        bt(
+            '[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]',
+            #  -- output --
+            '[\n' +
+            '    [\n' +
+            '        ["1", "2"],\n        ["3", "4"]\n' +
+            '    ],\n    [\n' +
+            '        ["5", "6", "7"],\n        ["8", "9", "0"]\n' +
+            '    ],\n    [\n' +
+            '        ["1", "2", "3"],\n        ["4", "5", "6", "7"],\n        ["8", "9", "0"]\n' +
+            '    ]\n' +
+            ']')
         bt(
             'changeCollection.add({\n' +
             '    name: "Jonathan" // New line inserted after this line on every save\n' +
             '    , age: 25\n' +
             '});',
+            #  -- output --
             'changeCollection.add({\n' +
             '    name: "Jonathan" // New line inserted after this line on every save\n' +
             '        ,\n    age: 25\n' +
@@ -350,6 +506,7 @@ def unicode_char(value):
             '        return true;\n' +
             '    }\n' +
             ');',
+            #  -- output --
             'changeCollection.add(\n' +
             '    function() {\n' +
             '        return true;\n' +
@@ -361,21 +518,82 @@ def unicode_char(value):
         # Comma-first option - (c0 = "\n, ", c1 = "\n    , ", c2 = "\n        , ", c3 = "\n            , ", f1 = ", ")
         self.reset_options();
         self.options.comma_first = true
-        bt('{a:1, b:2}', '{\n    a: 1\n    , b: 2\n}')
+        bt(
+            '{a:1, b:2}',
+            #  -- output --
+            '{\n' +
+            '    a: 1\n    , b: 2\n' +
+            '}')
         bt('var a=1, b=c[d], e=6;', 'var a = 1\n    , b = c[d]\n    , e = 6;')
-        bt('for(var a=1,b=2,c=3;d<3;d++)\ne', 'for (var a = 1, b = 2, c = 3; d < 3; d++)\n    e')
-        bt('for(var a=1,b=2,\nc=3;d<3;d++)\ne', 'for (var a = 1, b = 2\n        , c = 3; d < 3; d++)\n    e')
-        bt('function foo() {\n    return [\n        "one"\n        , "two"\n    ];\n}')
-        bt('a=[[1,2],[4,5],[7,8]]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , [7, 8]\n]')
-        bt('a=[[1,2],[4,5],[7,8],]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , [7, 8]\n, ]')
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , function() {}\n    , [7, 8]\n]')
-        bt('a=[[1,2],[4,5],function(){},function(){},[7,8]]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , function() {}\n    , function() {}\n    , [7, 8]\n]')
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2]\n    , [4, 5]\n    , function() {}\n    , [7, 8]\n]')
+        bt(
+            'for(var a=1,b=2,c=3;d<3;d++)\n' +
+            'e',
+            #  -- output --
+            'for (var a = 1, b = 2, c = 3; d < 3; d++)\n' +
+            '    e')
+        bt(
+            'for(var a=1,b=2,\n' +
+            'c=3;d<3;d++)\n' +
+            'e',
+            #  -- output --
+            'for (var a = 1, b = 2\n        , c = 3; d < 3; d++)\n' +
+            '    e')
+        bt(
+            'function foo() {\n' +
+            '    return [\n' +
+            '        "one"\n        , "two"\n' +
+            '    ];\n' +
+            '}')
+        bt(
+            'a=[[1,2],[4,5],[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],[7,8],]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , [7, 8]\n, ]')
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , function() {}\n    , [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],function(){},function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , function() {}\n    , function() {}\n    , [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2]\n    , [4, 5]\n    , function() {}\n    , [7, 8]\n' +
+            ']')
         bt('a=[b,c,function(){},function(){},d]', 'a = [b, c, function() {}, function() {}, d]')
-        bt('a=[b,c,\nfunction(){},function(){},d]', 'a = [b, c\n    , function() {}\n    , function() {}\n    , d\n]')
+        bt(
+            'a=[b,c,\n' +
+            'function(){},function(){},d]',
+            #  -- output --
+            'a = [b, c\n    , function() {}\n    , function() {}\n    , d\n' +
+            ']')
         bt('a=[a[1],b[4],c[d[7]]]', 'a = [a[1], b[4], c[d[7]]]')
         bt('[1,2,[3,4,[5,6],7],8]', '[1, 2, [3, 4, [5, 6], 7], 8]')
-        bt('[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]', '[\n    [\n        ["1", "2"]\n        , ["3", "4"]\n    ]\n    , [\n        ["5", "6", "7"]\n        , ["8", "9", "0"]\n    ]\n    , [\n        ["1", "2", "3"]\n        , ["4", "5", "6", "7"]\n        , ["8", "9", "0"]\n    ]\n]')
+        bt(
+            '[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]',
+            #  -- output --
+            '[\n' +
+            '    [\n' +
+            '        ["1", "2"]\n        , ["3", "4"]\n' +
+            '    ]\n    , [\n' +
+            '        ["5", "6", "7"]\n        , ["8", "9", "0"]\n' +
+            '    ]\n    , [\n' +
+            '        ["1", "2", "3"]\n        , ["4", "5", "6", "7"]\n        , ["8", "9", "0"]\n' +
+            '    ]\n' +
+            ']')
         bt(
             'changeCollection.add({\n' +
             '    name: "Jonathan" // New line inserted after this line on every save\n' +
@@ -390,6 +608,7 @@ def unicode_char(value):
             '        return true;\n' +
             '    }\n' +
             ');',
+            #  -- output --
             'changeCollection.add(\n' +
             '    function() {\n' +
             '        return true;\n' +
@@ -405,9 +624,28 @@ def unicode_char(value):
         self.options.space_in_paren = false
         self.options.space_in_empty_paren = false
         bt('if(p) foo(a,b);', 'if (p) foo(a, b);')
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }', 'try {\n    while (true) {\n        willThrow()\n    }\n} catch (result) switch (result) {\n    case 1:\n        ++result\n}')
+        bt(
+            'try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
+            #  -- output --
+            'try {\n' +
+            '    while (true) {\n' +
+            '        willThrow()\n' +
+            '    }\n' +
+            '} catch (result) switch (result) {\n' +
+            '    case 1:\n' +
+            '        ++result\n' +
+            '}')
         bt('((e/((a+(b)*c)-d))^2)*5;', '((e / ((a + (b) * c) - d)) ^ 2) * 5;')
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}', 'function f(a, b) {\n    if (a) b()\n}\n\nfunction g(a, b) {\n    if (!a) b()\n}')
+        bt(
+            'function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
+            #  -- output --
+            'function f(a, b) {\n' +
+            '    if (a) b()\n' +
+            '}\n' +
+            '\n' +
+            'function g(a, b) {\n' +
+            '    if (!a) b()\n' +
+            '}')
         bt('a=[];', 'a = [];')
         bt('a=[b,c,d];', 'a = [b, c, d];')
         bt('a= f[b];', 'a = f[b];')
@@ -420,6 +658,7 @@ def unicode_char(value):
             '        dest: "www/gui/build"\n' +
             '    } ]\n' +
             '}',
+            #  -- output --
             '{\n' +
             '    files: [{\n' +
             '        expand: true,\n' +
@@ -434,9 +673,28 @@ def unicode_char(value):
         self.options.space_in_paren = false
         self.options.space_in_empty_paren = true
         bt('if(p) foo(a,b);', 'if (p) foo(a, b);')
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }', 'try {\n    while (true) {\n        willThrow()\n    }\n} catch (result) switch (result) {\n    case 1:\n        ++result\n}')
+        bt(
+            'try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
+            #  -- output --
+            'try {\n' +
+            '    while (true) {\n' +
+            '        willThrow()\n' +
+            '    }\n' +
+            '} catch (result) switch (result) {\n' +
+            '    case 1:\n' +
+            '        ++result\n' +
+            '}')
         bt('((e/((a+(b)*c)-d))^2)*5;', '((e / ((a + (b) * c) - d)) ^ 2) * 5;')
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}', 'function f(a, b) {\n    if (a) b()\n}\n\nfunction g(a, b) {\n    if (!a) b()\n}')
+        bt(
+            'function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
+            #  -- output --
+            'function f(a, b) {\n' +
+            '    if (a) b()\n' +
+            '}\n' +
+            '\n' +
+            'function g(a, b) {\n' +
+            '    if (!a) b()\n' +
+            '}')
         bt('a=[];', 'a = [];')
         bt('a=[b,c,d];', 'a = [b, c, d];')
         bt('a= f[b];', 'a = f[b];')
@@ -449,6 +707,7 @@ def unicode_char(value):
             '        dest: "www/gui/build"\n' +
             '    } ]\n' +
             '}',
+            #  -- output --
             '{\n' +
             '    files: [{\n' +
             '        expand: true,\n' +
@@ -463,9 +722,28 @@ def unicode_char(value):
         self.options.space_in_paren = true
         self.options.space_in_empty_paren = false
         bt('if(p) foo(a,b);', 'if ( p ) foo( a, b );')
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }', 'try {\n    while ( true ) {\n        willThrow()\n    }\n} catch ( result ) switch ( result ) {\n    case 1:\n        ++result\n}')
+        bt(
+            'try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
+            #  -- output --
+            'try {\n' +
+            '    while ( true ) {\n' +
+            '        willThrow()\n' +
+            '    }\n' +
+            '} catch ( result ) switch ( result ) {\n' +
+            '    case 1:\n' +
+            '        ++result\n' +
+            '}')
         bt('((e/((a+(b)*c)-d))^2)*5;', '( ( e / ( ( a + ( b ) * c ) - d ) ) ^ 2 ) * 5;')
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}', 'function f( a, b ) {\n    if ( a ) b()\n}\n\nfunction g( a, b ) {\n    if ( !a ) b()\n}')
+        bt(
+            'function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
+            #  -- output --
+            'function f( a, b ) {\n' +
+            '    if ( a ) b()\n' +
+            '}\n' +
+            '\n' +
+            'function g( a, b ) {\n' +
+            '    if ( !a ) b()\n' +
+            '}')
         bt('a=[];', 'a = [];')
         bt('a=[b,c,d];', 'a = [ b, c, d ];')
         bt('a= f[b];', 'a = f[ b ];')
@@ -484,9 +762,28 @@ def unicode_char(value):
         self.options.space_in_paren = true
         self.options.space_in_empty_paren = true
         bt('if(p) foo(a,b);', 'if ( p ) foo( a, b );')
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }', 'try {\n    while ( true ) {\n        willThrow( )\n    }\n} catch ( result ) switch ( result ) {\n    case 1:\n        ++result\n}')
+        bt(
+            'try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
+            #  -- output --
+            'try {\n' +
+            '    while ( true ) {\n' +
+            '        willThrow( )\n' +
+            '    }\n' +
+            '} catch ( result ) switch ( result ) {\n' +
+            '    case 1:\n' +
+            '        ++result\n' +
+            '}')
         bt('((e/((a+(b)*c)-d))^2)*5;', '( ( e / ( ( a + ( b ) * c ) - d ) ) ^ 2 ) * 5;')
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}', 'function f( a, b ) {\n    if ( a ) b( )\n}\n\nfunction g( a, b ) {\n    if ( !a ) b( )\n}')
+        bt(
+            'function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
+            #  -- output --
+            'function f( a, b ) {\n' +
+            '    if ( a ) b( )\n' +
+            '}\n' +
+            '\n' +
+            'function g( a, b ) {\n' +
+            '    if ( !a ) b( )\n' +
+            '}')
         bt('a=[];', 'a = [ ];')
         bt('a=[b,c,d];', 'a = [ b, c, d ];')
         bt('a= f[b];', 'a = f[ b ];')
@@ -543,6 +840,7 @@ def unicode_char(value):
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            #  -- output --
             'var res = a + b - c / d * e % f;\n' +
             'var res = g & h | i ^ j;\n' +
             'var res = (k && l || m) ? n : o;\n' +
@@ -591,6 +889,7 @@ def unicode_char(value):
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            #  -- output --
             'var res = a + b - c / d * e % f;\n' +
             'var res = g & h | i ^ j;\n' +
             'var res = (k && l || m) ? n : o;\n' +
@@ -639,6 +938,7 @@ def unicode_char(value):
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            #  -- output --
             'var res = a + b - c / d * e % f;\n' +
             'var res = g & h | i ^ j;\n' +
             'var res = (k && l || m) ? n : o;\n' +
@@ -682,6 +982,7 @@ def unicode_char(value):
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            #  -- output --
             'var res = a + b -\n' +
             '    c /\n' +
             '    d * e %\n' +
@@ -722,6 +1023,7 @@ def unicode_char(value):
             ': h;\n' +
             'var i = j ? k :\n' +
             'l;',
+            #  -- output --
             'var a = {\n' +
             '    b: bval,\n' +
             '    c: cval,\n' +
@@ -749,6 +1051,7 @@ def unicode_char(value):
             '        anOcean\n' +
             '        || aRiver);\n' +
             '}',
+            #  -- output --
             'var d = 1;\n' +
             'if (a === b &&\n' +
             '    c) {\n' +
@@ -802,6 +1105,7 @@ def unicode_char(value):
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            #  -- output --
             'var res = a + b\n' +
             '    - c\n' +
             '    / d * e\n' +
@@ -841,6 +1145,7 @@ def unicode_char(value):
             ': h;\n' +
             'var i = j ? k :\n' +
             'l;',
+            #  -- output --
             'var a = {\n' +
             '    b: bval,\n' +
             '    c: cval,\n' +
@@ -868,6 +1173,7 @@ def unicode_char(value):
             '        anOcean\n' +
             '        || aRiver);\n' +
             '}',
+            #  -- output --
             'var d = 1;\n' +
             'if (a === b\n' +
             '    && c) {\n' +
@@ -921,6 +1227,7 @@ def unicode_char(value):
             'ab;\n' +
             'ac +\n' +
             '-ad',
+            #  -- output --
             'var res = a + b\n' +
             '    - c /\n' +
             '    d * e\n' +
@@ -962,6 +1269,7 @@ def unicode_char(value):
             ': h;\n' +
             'var i = j ? k :\n' +
             'l;',
+            #  -- output --
             'var a = {\n' +
             '    b: bval,\n' +
             '    c: cval,\n' +
@@ -1011,15 +1319,26 @@ def unicode_char(value):
         self.reset_options();
         bt('async function foo() {}')
         bt('let w = async function foo() {}')
-        bt('async function foo() {}\nvar x = await foo();')
+        bt(
+            'async function foo() {}\n' +
+            'var x = await foo();')
         
         # async function as an input to another function
         bt('wrapper(async function foo() {})')
         
         # await on inline anonymous function. should have a space after await
         bt(
-            'async function() {\n    var w = await(async function() {\n        return await foo();\n    })();\n}',
-            'async function() {\n    var w = await (async function() {\n        return await foo();\n    })();\n}')
+            'async function() {\n' +
+            '    var w = await(async function() {\n' +
+            '        return await foo();\n' +
+            '    })();\n' +
+            '}',
+            #  -- output --
+            'async function() {\n' +
+            '    var w = await (async function() {\n' +
+            '        return await foo();\n' +
+            '    })();\n' +
+            '}')
         
         # ensure that this doesn't break anyone with the async library
         bt('async.map(function(t) {})')
@@ -1029,7 +1348,12 @@ def unicode_char(value):
         # e4x - Test that e4x literals passed through when e4x-option is enabled
         self.reset_options();
         self.options.e4x = true
-        bt('xml=<a b="c"><d/><e>\n foo</e>x</a>;', 'xml = <a b="c"><d/><e>\n foo</e>x</a>;')
+        bt(
+            'xml=<a b="c"><d/><e>\n' +
+            ' foo</e>x</a>;',
+            #  -- output --
+            'xml = <a b="c"><d/><e>\n' +
+            ' foo</e>x</a>;')
         bt('<a b=\'This is a quoted "c".\'/>')
         bt('<a b="This is a quoted \'c\'."/>')
         bt('<a b="A quote \' inside string."/>')
@@ -1037,8 +1361,20 @@ def unicode_char(value):
         bt('<a b=\'Some """ quotes ""  inside string.\'/>')
         
         # Handles inline expressions
-        bt('xml=<{a} b="c"><d/><e v={z}>\n foo</e>x</{a}>;', 'xml = <{a} b="c"><d/><e v={z}>\n foo</e>x</{a}>;')
-        bt('xml=<{a} b="c">\n    <e v={z}>\n foo</e>x</{a}>;', 'xml = <{a} b="c">\n    <e v={z}>\n foo</e>x</{a}>;')
+        bt(
+            'xml=<{a} b="c"><d/><e v={z}>\n' +
+            ' foo</e>x</{a}>;',
+            #  -- output --
+            'xml = <{a} b="c"><d/><e v={z}>\n' +
+            ' foo</e>x</{a}>;')
+        bt(
+            'xml=<{a} b="c">\n' +
+            '    <e v={z}>\n' +
+            ' foo</e>x</{a}>;',
+            #  -- output --
+            'xml = <{a} b="c">\n' +
+            '    <e v={z}>\n' +
+            ' foo</e>x</{a}>;')
         
         # xml literals with special characters in elem names - see http://www.w3.org/TR/REC-xml/#NT-NameChar
         bt('xml = <_:.valid.xml- _:.valid.xml-="123"/>;')
@@ -1047,7 +1383,12 @@ def unicode_char(value):
         bt('xml = <elem someAttr/>;')
         
         # Handles CDATA
-        bt('xml=<![CDATA[ b="c"><d/><e v={z}>\n foo</e>x/]]>;', 'xml = <![CDATA[ b="c"><d/><e v={z}>\n foo</e>x/]]>;')
+        bt(
+            'xml=<![CDATA[ b="c"><d/><e v={z}>\n' +
+            ' foo</e>x/]]>;',
+            #  -- output --
+            'xml = <![CDATA[ b="c"><d/><e v={z}>\n' +
+            ' foo</e>x/]]>;')
         bt('xml=<![CDATA[]]>;', 'xml = <![CDATA[]]>;')
         bt('xml=<a b="c"><![CDATA[d/></a></{}]]></a>;', 'xml = <a b="c"><![CDATA[d/></a></{}]]></a>;')
         
@@ -1201,6 +1542,7 @@ def unicode_char(value):
             '    }\n' +
             '});\n' +
             'React.render(<MarkdownEditor />, mountNode);',
+            #  -- output --
             'var converter = new Showdown.converter();\n' +
             'var MarkdownEditor = React.createClass({\n' +
             '    getInitialState: function() {\n' +
@@ -1248,6 +1590,7 @@ def unicode_char(value):
             '    );\n' +
             'var qwer = <DropDown> A dropdown list <Menu> <MenuItem>Do Something</MenuItem> <MenuItem>Do Something Fun!</MenuItem> <MenuItem>Do Something Else</MenuItem> </Menu> </DropDown>;\n' +
             'render(dropdown);',
+            #  -- output --
             'var content = (\n' +
             '    <Nav>\n' +
             '            {/* child comment, put {} around */}\n' +
@@ -1268,13 +1611,17 @@ def unicode_char(value):
         # as long as nesting matches.
         bt(
             'xml=<a x="jn"><c></b></f><a><d jnj="jnn"><f></a ></nj></a>;',
+            #  -- output --
             'xml = <a x="jn"><c></b></f><a><d jnj="jnn"><f></a ></nj></a>;')
         
         # If xml is not terminated, the remainder of the file is treated
         # as part of the xml-literal (passed through unaltered)
         test_fragment(
-            'xml=<a></b>\nc<b;',
-            'xml = <a></b>\nc<b;')
+            'xml=<a></b>\n' +
+            'c<b;',
+            #  -- output --
+            'xml = <a></b>\n' +
+            'c<b;')
         
         # Issue #646 = whitespace is allowed in attribute declarations
         bt(
@@ -1355,6 +1702,7 @@ def unicode_char(value):
             '       {children}\n' +
             '    </{a + b}>\n' +
             '    );',
+            #  -- output --
             'return (\n' +
             '    <{\n' +
             '        a + b\n' +
@@ -1373,29 +1721,61 @@ def unicode_char(value):
         self.reset_options();
         self.options.e4x = false
         bt(
-            'xml=<a b="c"><d/><e>\n foo</e>x</a>;',
-            'xml = < a b = "c" > < d / > < e >\n    foo < /e>x</a > ;')
+            'xml=<a b="c"><d/><e>\n' +
+            ' foo</e>x</a>;',
+            #  -- output --
+            'xml = < a b = "c" > < d / > < e >\n' +
+            '    foo < /e>x</a > ;')
 
 
         #============================================================
         # Multiple braces
         self.reset_options();
-        bt('{{}/z/}', '{\n    {}\n    /z/\n}')
+        bt(
+            '{{}/z/}',
+            #  -- output --
+            '{\n' +
+            '    {}\n' +
+            '    /z/\n' +
+            '}')
 
 
         #============================================================
         # Beautify preserve formatting
         self.reset_options();
-        bt('/* beautify preserve:start */\n/* beautify preserve:end */')
-        bt('/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */')
-        bt('var a = 1;\n/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */')
-        bt('/* beautify preserve:start */     {asdklgh;y;;{}dd2d}/* beautify preserve:end */')
         bt(
-            'var a =  1;\n/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */',
-            'var a = 1;\n/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */')
+            '/* beautify preserve:start */\n' +
+            '/* beautify preserve:end */')
+        bt(
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */')
+        bt(
+            'var a = 1;\n' +
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */')
+        bt('/* beautify preserve:start */     {asdklgh;y;;{}dd2d}/* beautify preserve:end */')
         bt(
-            'var a = 1;\n /* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */',
-            'var a = 1;\n/* beautify preserve:start */\n   var a = 1;\n/* beautify preserve:end */')
+            'var a =  1;\n' +
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */',
+            #  -- output --
+            'var a = 1;\n' +
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */')
+        bt(
+            'var a = 1;\n' +
+            ' /* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */',
+            #  -- output --
+            'var a = 1;\n' +
+            '/* beautify preserve:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify preserve:end */')
         bt(
             'var a = {\n' +
             '    /* beautify preserve:start */\n' +
@@ -1414,6 +1794,7 @@ def unicode_char(value):
             '    ten   : 10\n' +
             '/* beautify preserve:end */\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /* beautify preserve:start */\n' +
             '    one   :  1,\n' +
@@ -1432,6 +1813,7 @@ def unicode_char(value):
             '    three :  3,\n' +
             '    ten   : 10\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /*  beautify preserve:start  */\n' +
             '    one: 1,\n' +
@@ -1447,6 +1829,7 @@ def unicode_char(value):
             '    three :  3,\n' +
             '    ten   : 10\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /*beautify preserve:start*/\n' +
             '    one: 1,\n' +
@@ -1462,6 +1845,7 @@ def unicode_char(value):
             '    three :  3,\n' +
             '    ten   : 10\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /*beautify  preserve:start*/\n' +
             '    one: 1,\n' +
@@ -1471,16 +1855,39 @@ def unicode_char(value):
             '};')
         
         # Directive: ignore
-        bt('/* beautify ignore:start */\n/* beautify ignore:end */')
-        bt('/* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */')
-        bt('var a = 1;\n/* beautify ignore:start */\n   var a = 1;\n/* beautify ignore:end */')
-        bt('/* beautify ignore:start */     {asdklgh;y;+++;dd2d}/* beautify ignore:end */')
         bt(
-            'var a =  1;\n/* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */',
-            'var a = 1;\n/* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */')
+            '/* beautify ignore:start */\n' +
+            '/* beautify ignore:end */')
+        bt(
+            '/* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */')
+        bt(
+            'var a = 1;\n' +
+            '/* beautify ignore:start */\n' +
+            '   var a = 1;\n' +
+            '/* beautify ignore:end */')
+        bt('/* beautify ignore:start */     {asdklgh;y;+++;dd2d}/* beautify ignore:end */')
         bt(
-            'var a = 1;\n /* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */',
-            'var a = 1;\n/* beautify ignore:start */\n   var a,,,{ 1;\n/* beautify ignore:end */')
+            'var a =  1;\n' +
+            '/* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */',
+            #  -- output --
+            'var a = 1;\n' +
+            '/* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */')
+        bt(
+            'var a = 1;\n' +
+            ' /* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */',
+            #  -- output --
+            'var a = 1;\n' +
+            '/* beautify ignore:start */\n' +
+            '   var a,,,{ 1;\n' +
+            '/* beautify ignore:end */')
         bt(
             'var a = {\n' +
             '    /* beautify ignore:start */\n' +
@@ -1499,6 +1906,7 @@ def unicode_char(value):
             '    ten   : 10\n' +
             '/* beautify ignore:end */\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start */\n' +
             '    one   :  1\n' +
@@ -1521,6 +1929,7 @@ def unicode_char(value):
             '    ten   : 10\n' +
             '/* beautify preserve:end */\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /* beautify preserve:start */\n' +
             '/* beautify preserve:start */\n' +
@@ -1543,6 +1952,7 @@ def unicode_char(value):
             '    ten   : 10\n' +
             '/* beautify ignore:end */\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start */\n' +
             '    one   :  1\n' +
@@ -1569,6 +1979,7 @@ def unicode_char(value):
             '    ==The next comment ends the starting ignore==\n' +
             '/* beautify ignore:end */\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start */\n' +
             '    one   :  1\n' +
@@ -1594,6 +2005,7 @@ def unicode_char(value):
             '    ten   : 10\n' +
             '   // This is all preserved\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start preserve:start */\n' +
             '    one   :  {\n' +
@@ -1618,6 +2030,7 @@ def unicode_char(value):
             '/* beautify preserve:end */\n' +
             '     eleven: 11\n' +
             '};',
+            #  -- output --
             'var a = {\n' +
             '    /* beautify ignore:start preserve:start */\n' +
             '    one   :  {\n' +
@@ -1737,33 +2150,91 @@ def unicode_char(value):
         self.options.space_after_anon_function = true
         bt(
             'a=typeof(x)',
+            #  -- output --
             'a = typeof (x)')
         bt(
-            'x();\n\nfunction(){}',
-            'x();\n\nfunction () {}')
+            'x();\n' +
+            '\n' +
+            'function(){}',
+            #  -- output --
+            'x();\n' +
+            '\n' +
+            'function () {}')
         bt(
-            'x();\n\nvar x = {\nx: function(){}\n}',
-            'x();\n\nvar x = {\n    x: function () {}\n}')
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            'x: function(){}\n' +
+            '}',
+            #  -- output --
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            '    x: function () {}\n' +
+            '}')
         bt(
-            'function () {\n    var a, b, c, d, e = [],\n        f;\n}')
+            'function () {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}')
         bt(
             'switch(x) {case 0: case 1: a(); break; default: break}',
-            'switch (x) {\ncase 0:\ncase 1:\n    a();\n    break;\ndefault:\n    break\n}')
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\ncase -1:\n    break;\ncase !y:\n    break;\n}')
+            #  -- output --
+            'switch (x) {\n' +
+            'case 0:\n' +
+            'case 1:\n' +
+            '    a();\n' +
+            '    break;\n' +
+            'default:\n' +
+            '    break\n' +
+            '}')
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            #  -- output --
+            'switch (x) {\n' +
+            'case -1:\n' +
+            '    break;\n' +
+            'case !y:\n' +
+            '    break;\n' +
+            '}')
         
         # typical greasemonkey start
-        test_fragment('// comment 2\n(function ()')
+        test_fragment(
+            '// comment 2\n' +
+            '(function ()')
         bt(
             'var a2, b2, c2, d2 = 0, c = function() {}, d = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';')
-        bt(
-            'var a2, b2, c2, d2 = 0, c = function() {},\nd = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';')
+            #  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';')
+        bt(
+            'var a2, b2, c2, d2 = 0, c = function() {},\n' +
+            'd = \'\';',
+            #  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';')
         bt(
             'var o2=$.extend(a);function(){alert(x);}',
-            'var o2 = $.extend(a);\n\nfunction () {\n    alert(x);\n}')
-        bt('function*() {\n    yield 1;\n}', 'function* () {\n    yield 1;\n}')
-        bt('function* x() {\n    yield 1;\n}')
+            #  -- output --
+            'var o2 = $.extend(a);\n' +
+            '\n' +
+            'function () {\n' +
+            '    alert(x);\n' +
+            '}')
+        bt(
+            'function*() {\n' +
+            '    yield 1;\n' +
+            '}',
+            #  -- output --
+            'function* () {\n' +
+            '    yield 1;\n' +
+            '}')
+        bt(
+            'function* x() {\n' +
+            '    yield 1;\n' +
+            '}')
 
         # jslint and space after anon function - (f = " ", c = "")
         self.reset_options();
@@ -1771,33 +2242,91 @@ def unicode_char(value):
         self.options.space_after_anon_function = false
         bt(
             'a=typeof(x)',
+            #  -- output --
             'a = typeof (x)')
         bt(
-            'x();\n\nfunction(){}',
-            'x();\n\nfunction () {}')
+            'x();\n' +
+            '\n' +
+            'function(){}',
+            #  -- output --
+            'x();\n' +
+            '\n' +
+            'function () {}')
         bt(
-            'x();\n\nvar x = {\nx: function(){}\n}',
-            'x();\n\nvar x = {\n    x: function () {}\n}')
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            'x: function(){}\n' +
+            '}',
+            #  -- output --
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            '    x: function () {}\n' +
+            '}')
         bt(
-            'function () {\n    var a, b, c, d, e = [],\n        f;\n}')
+            'function () {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}')
         bt(
             'switch(x) {case 0: case 1: a(); break; default: break}',
-            'switch (x) {\ncase 0:\ncase 1:\n    a();\n    break;\ndefault:\n    break\n}')
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\ncase -1:\n    break;\ncase !y:\n    break;\n}')
+            #  -- output --
+            'switch (x) {\n' +
+            'case 0:\n' +
+            'case 1:\n' +
+            '    a();\n' +
+            '    break;\n' +
+            'default:\n' +
+            '    break\n' +
+            '}')
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            #  -- output --
+            'switch (x) {\n' +
+            'case -1:\n' +
+            '    break;\n' +
+            'case !y:\n' +
+            '    break;\n' +
+            '}')
         
         # typical greasemonkey start
-        test_fragment('// comment 2\n(function ()')
+        test_fragment(
+            '// comment 2\n' +
+            '(function ()')
         bt(
             'var a2, b2, c2, d2 = 0, c = function() {}, d = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';')
-        bt(
-            'var a2, b2, c2, d2 = 0, c = function() {},\nd = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';')
+            #  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';')
+        bt(
+            'var a2, b2, c2, d2 = 0, c = function() {},\n' +
+            'd = \'\';',
+            #  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';')
         bt(
             'var o2=$.extend(a);function(){alert(x);}',
-            'var o2 = $.extend(a);\n\nfunction () {\n    alert(x);\n}')
-        bt('function*() {\n    yield 1;\n}', 'function* () {\n    yield 1;\n}')
-        bt('function* x() {\n    yield 1;\n}')
+            #  -- output --
+            'var o2 = $.extend(a);\n' +
+            '\n' +
+            'function () {\n' +
+            '    alert(x);\n' +
+            '}')
+        bt(
+            'function*() {\n' +
+            '    yield 1;\n' +
+            '}',
+            #  -- output --
+            'function* () {\n' +
+            '    yield 1;\n' +
+            '}')
+        bt(
+            'function* x() {\n' +
+            '    yield 1;\n' +
+            '}')
 
         # jslint and space after anon function - (f = " ", c = "    ")
         self.reset_options();
@@ -1805,33 +2334,91 @@ def unicode_char(value):
         self.options.space_after_anon_function = true
         bt(
             'a=typeof(x)',
+            #  -- output --
             'a = typeof (x)')
         bt(
-            'x();\n\nfunction(){}',
-            'x();\n\nfunction () {}')
+            'x();\n' +
+            '\n' +
+            'function(){}',
+            #  -- output --
+            'x();\n' +
+            '\n' +
+            'function () {}')
         bt(
-            'x();\n\nvar x = {\nx: function(){}\n}',
-            'x();\n\nvar x = {\n    x: function () {}\n}')
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            'x: function(){}\n' +
+            '}',
+            #  -- output --
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            '    x: function () {}\n' +
+            '}')
         bt(
-            'function () {\n    var a, b, c, d, e = [],\n        f;\n}')
+            'function () {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}')
         bt(
             'switch(x) {case 0: case 1: a(); break; default: break}',
-            'switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}')
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}')
+            #  -- output --
+            'switch (x) {\n' +
+            '    case 0:\n' +
+            '    case 1:\n' +
+            '        a();\n' +
+            '        break;\n' +
+            '    default:\n' +
+            '        break\n' +
+            '}')
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            #  -- output --
+            'switch (x) {\n' +
+            '    case -1:\n' +
+            '        break;\n' +
+            '    case !y:\n' +
+            '        break;\n' +
+            '}')
         
         # typical greasemonkey start
-        test_fragment('// comment 2\n(function ()')
+        test_fragment(
+            '// comment 2\n' +
+            '(function ()')
         bt(
             'var a2, b2, c2, d2 = 0, c = function() {}, d = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';')
-        bt(
-            'var a2, b2, c2, d2 = 0, c = function() {},\nd = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function () {},\n    d = \'\';')
+            #  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';')
+        bt(
+            'var a2, b2, c2, d2 = 0, c = function() {},\n' +
+            'd = \'\';',
+            #  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function () {},\n' +
+            '    d = \'\';')
         bt(
             'var o2=$.extend(a);function(){alert(x);}',
-            'var o2 = $.extend(a);\n\nfunction () {\n    alert(x);\n}')
-        bt('function*() {\n    yield 1;\n}', 'function* () {\n    yield 1;\n}')
-        bt('function* x() {\n    yield 1;\n}')
+            #  -- output --
+            'var o2 = $.extend(a);\n' +
+            '\n' +
+            'function () {\n' +
+            '    alert(x);\n' +
+            '}')
+        bt(
+            'function*() {\n' +
+            '    yield 1;\n' +
+            '}',
+            #  -- output --
+            'function* () {\n' +
+            '    yield 1;\n' +
+            '}')
+        bt(
+            'function* x() {\n' +
+            '    yield 1;\n' +
+            '}')
 
         # jslint and space after anon function - (f = "", c = "    ")
         self.reset_options();
@@ -1839,34 +2426,92 @@ def unicode_char(value):
         self.options.space_after_anon_function = false
         bt(
             'a=typeof(x)',
+            #  -- output --
             'a = typeof(x)')
         bt(
-            'x();\n\nfunction(){}',
-            'x();\n\nfunction() {}')
+            'x();\n' +
+            '\n' +
+            'function(){}',
+            #  -- output --
+            'x();\n' +
+            '\n' +
+            'function() {}')
         bt(
-            'x();\n\nvar x = {\nx: function(){}\n}',
-            'x();\n\nvar x = {\n    x: function() {}\n}')
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            'x: function(){}\n' +
+            '}',
+            #  -- output --
+            'x();\n' +
+            '\n' +
+            'var x = {\n' +
+            '    x: function() {}\n' +
+            '}')
         bt(
-            'function () {\n    var a, b, c, d, e = [],\n        f;\n}',
-            'function() {\n    var a, b, c, d, e = [],\n        f;\n}')
+            'function () {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}',
+            #  -- output --
+            'function() {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}')
         bt(
             'switch(x) {case 0: case 1: a(); break; default: break}',
-            'switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}')
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}')
+            #  -- output --
+            'switch (x) {\n' +
+            '    case 0:\n' +
+            '    case 1:\n' +
+            '        a();\n' +
+            '        break;\n' +
+            '    default:\n' +
+            '        break\n' +
+            '}')
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            #  -- output --
+            'switch (x) {\n' +
+            '    case -1:\n' +
+            '        break;\n' +
+            '    case !y:\n' +
+            '        break;\n' +
+            '}')
         
         # typical greasemonkey start
-        test_fragment('// comment 2\n(function()')
+        test_fragment(
+            '// comment 2\n' +
+            '(function()')
         bt(
             'var a2, b2, c2, d2 = 0, c = function() {}, d = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function() {},\n    d = \'\';')
-        bt(
-            'var a2, b2, c2, d2 = 0, c = function() {},\nd = \'\';',
-            'var a2, b2, c2, d2 = 0,\n    c = function() {},\n    d = \'\';')
+            #  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function() {},\n' +
+            '    d = \'\';')
+        bt(
+            'var a2, b2, c2, d2 = 0, c = function() {},\n' +
+            'd = \'\';',
+            #  -- output --
+            'var a2, b2, c2, d2 = 0,\n' +
+            '    c = function() {},\n' +
+            '    d = \'\';')
         bt(
             'var o2=$.extend(a);function(){alert(x);}',
-            'var o2 = $.extend(a);\n\nfunction() {\n    alert(x);\n}')
-        bt('function*() {\n    yield 1;\n}')
-        bt('function* x() {\n    yield 1;\n}')
+            #  -- output --
+            'var o2 = $.extend(a);\n' +
+            '\n' +
+            'function() {\n' +
+            '    alert(x);\n' +
+            '}')
+        bt(
+            'function*() {\n' +
+            '    yield 1;\n' +
+            '}')
+        bt(
+            'function* x() {\n' +
+            '    yield 1;\n' +
+            '}')
 
 
         #============================================================
@@ -1908,6 +2553,7 @@ def unicode_char(value):
             'var test = 1;')
         bt(
             '(function() {if (!window.FOO) window.FOO || (window.FOO = function() {var b = {bar: "zort"};});})();',
+            #  -- output --
             '(function() {\n' +
             '    if (!window.FOO) window.FOO || (window.FOO = function() {\n' +
             '        var b = {\n' +
@@ -1999,6 +2645,7 @@ def unicode_char(value):
         # Issue 331 - if-else with braces edge case
         bt(
             'if(x){a();}else{b();}if(y){c();}',
+            #  -- output --
             'if (x) {\n' +
             '    a();\n' +
             '} else {\n' +
@@ -2348,6 +2995,7 @@ def unicode_char(value):
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function kindaComplex() {\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2366,6 +3014,7 @@ def unicode_char(value):
             '        }\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function complex() {\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2391,6 +3040,7 @@ def unicode_char(value):
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function kindaComplex()\n{\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2409,6 +3059,7 @@ def unicode_char(value):
             '        }\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function complex()\n{\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2434,6 +3085,7 @@ def unicode_char(value):
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function kindaComplex() {\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2452,6 +3104,7 @@ def unicode_char(value):
             '        }\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function complex() {\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2477,6 +3130,7 @@ def unicode_char(value):
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function kindaComplex() {\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2495,6 +3149,7 @@ def unicode_char(value):
             '        }\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function complex() {\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2520,6 +3175,7 @@ def unicode_char(value):
             '        e: "e"\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function kindaComplex() {\n    var a = 2;\n' +
             '    var obj = {};\n' +
             '    var obj2 = { a: "a", b: "b" };\n' +
@@ -2538,6 +3194,7 @@ def unicode_char(value):
             '        }\n' +
             '    };\n' +
             '}',
+            #  -- output --
             'function complex() {\n    console.log("wowe");\n' +
             '    (function() { var a = 2; var b = 3; })();\n' +
             '    $.each(arr, function(el, idx) { return el; });\n' +
@@ -2584,8 +3241,7 @@ def unicode_char(value):
             '}')
         
         # Issue 315 - Short objects
-        bt(
-            'var a = { b: { c: { d: e } } };')
+        bt('var a = { b: { c: { d: e } } };')
         bt(
             'var a = {\n' +
             '    b: {\n' +
@@ -2657,31 +3313,87 @@ def unicode_char(value):
         self.reset_options();
         bt('')
         test_fragment('   return .5')
-        test_fragment('   return .5;\n   a();')
-        test_fragment('    return .5;\n    a();')
-        test_fragment('     return .5;\n     a();')
+        test_fragment(
+            '   return .5;\n' +
+            '   a();')
+        test_fragment(
+            '    return .5;\n' +
+            '    a();')
+        test_fragment(
+            '     return .5;\n' +
+            '     a();')
         test_fragment('   < div')
         bt('a        =          1', 'a = 1')
         bt('a=1', 'a = 1')
         bt('(3) / 2')
         bt('["a", "b"].join("")')
-        bt('a();\n\nb();')
-        bt('var a = 1 var b = 2', 'var a = 1\nvar b = 2')
-        bt('var a=1, b=c[d], e=6;', 'var a = 1,\n    b = c[d],\n    e = 6;')
-        bt('var a,\n    b,\n    c;')
-        bt('let a = 1 let b = 2', 'let a = 1\nlet b = 2')
-        bt('let a=1, b=c[d], e=6;', 'let a = 1,\n    b = c[d],\n    e = 6;')
-        bt('let a,\n    b,\n    c;')
-        bt('const a = 1 const b = 2', 'const a = 1\nconst b = 2')
-        bt('const a=1, b=c[d], e=6;', 'const a = 1,\n    b = c[d],\n    e = 6;')
-        bt('const a,\n    b,\n    c;')
+        bt(
+            'a();\n' +
+            '\n' +
+            'b();')
+        bt(
+            'var a = 1 var b = 2',
+            #  -- output --
+            'var a = 1\n' +
+            'var b = 2')
+        bt(
+            'var a=1, b=c[d], e=6;',
+            #  -- output --
+            'var a = 1,\n' +
+            '    b = c[d],\n' +
+            '    e = 6;')
+        bt(
+            'var a,\n' +
+            '    b,\n' +
+            '    c;')
+        bt(
+            'let a = 1 let b = 2',
+            #  -- output --
+            'let a = 1\n' +
+            'let b = 2')
+        bt(
+            'let a=1, b=c[d], e=6;',
+            #  -- output --
+            'let a = 1,\n' +
+            '    b = c[d],\n' +
+            '    e = 6;')
+        bt(
+            'let a,\n' +
+            '    b,\n' +
+            '    c;')
+        bt(
+            'const a = 1 const b = 2',
+            #  -- output --
+            'const a = 1\n' +
+            'const b = 2')
+        bt(
+            'const a=1, b=c[d], e=6;',
+            #  -- output --
+            'const a = 1,\n' +
+            '    b = c[d],\n' +
+            '    e = 6;')
+        bt(
+            'const a,\n' +
+            '    b,\n' +
+            '    c;')
         bt('a = " 12345 "')
         bt('a = \' 12345 \'')
         bt('if (a == 1) b = 2;')
-        bt('if(1){2}else{3}', 'if (1) {\n    2\n} else {\n    3\n}')
+        bt(
+            'if(1){2}else{3}',
+            #  -- output --
+            'if (1) {\n' +
+            '    2\n' +
+            '} else {\n' +
+            '    3\n' +
+            '}')
         bt('if(1||2);', 'if (1 || 2);')
         bt('(a==1)||(b==2)', '(a == 1) || (b == 2)')
-        bt('var a = 1 if (2) 3;', 'var a = 1\nif (2) 3;')
+        bt(
+            'var a = 1 if (2) 3;',
+            #  -- output --
+            'var a = 1\n' +
+            'if (2) 3;')
         bt('a = a + 1')
         bt('a = a == 1')
         bt('/12345[^678]*9+/.match(a)')
@@ -2784,79 +3496,262 @@ def unicode_char(value):
         bt('a=0Bg0b0o0', 'a = 0B g0b0o0')
         bt('a = [1, 2, 3, 4]')
         bt('F*(g/=f)*g+b', 'F * (g /= f) * g + b')
-        bt('a.b({c:d})', 'a.b({\n    c: d\n})')
-        bt('a.b\n(\n{\nc:\nd\n}\n)', 'a.b({\n    c: d\n})')
-        bt('a.b({c:"d"})', 'a.b({\n    c: "d"\n})')
-        bt('a.b\n(\n{\nc:\n"d"\n}\n)', 'a.b({\n    c: "d"\n})')
+        bt(
+            'a.b({c:d})',
+            #  -- output --
+            'a.b({\n' +
+            '    c: d\n' +
+            '})')
+        bt(
+            'a.b\n' +
+            '(\n' +
+            '{\n' +
+            'c:\n' +
+            'd\n' +
+            '}\n' +
+            ')',
+            #  -- output --
+            'a.b({\n' +
+            '    c: d\n' +
+            '})')
+        bt(
+            'a.b({c:"d"})',
+            #  -- output --
+            'a.b({\n' +
+            '    c: "d"\n' +
+            '})')
+        bt(
+            'a.b\n' +
+            '(\n' +
+            '{\n' +
+            'c:\n' +
+            '"d"\n' +
+            '}\n' +
+            ')',
+            #  -- output --
+            'a.b({\n' +
+            '    c: "d"\n' +
+            '})')
         bt('a=!b', 'a = !b')
         bt('a=!!b', 'a = !!b')
         bt('a?b:c', 'a ? b : c')
         bt('a?1:2', 'a ? 1 : 2')
         bt('a?(b):c', 'a ? (b) : c')
-        bt('x={a:1,b:w=="foo"?x:y,c:z}', 'x = {\n    a: 1,\n    b: w == "foo" ? x : y,\n    c: z\n}')
+        bt(
+            'x={a:1,b:w=="foo"?x:y,c:z}',
+            #  -- output --
+            'x = {\n' +
+            '    a: 1,\n' +
+            '    b: w == "foo" ? x : y,\n' +
+            '    c: z\n' +
+            '}')
         bt('x=a?b?c?d:e:f:g;', 'x = a ? b ? c ? d : e : f : g;')
-        bt('x=a?b?c?d:{e1:1,e2:2}:f:g;', 'x = a ? b ? c ? d : {\n    e1: 1,\n    e2: 2\n} : f : g;')
+        bt(
+            'x=a?b?c?d:{e1:1,e2:2}:f:g;',
+            #  -- output --
+            'x = a ? b ? c ? d : {\n' +
+            '    e1: 1,\n' +
+            '    e2: 2\n' +
+            '} : f : g;')
         bt('function void(void) {}')
         bt('if(!a)foo();', 'if (!a) foo();')
         bt('a=~a', 'a = ~a')
-        bt('a;/*comment*/b;', 'a; /*comment*/\nb;')
-        bt('a;/* comment */b;', 'a; /* comment */\nb;')
+        bt(
+            'a;/*comment*/b;',
+            #  -- output --
+            'a; /*comment*/\n' +
+            'b;')
+        bt(
+            'a;/* comment */b;',
+            #  -- output --
+            'a; /* comment */\n' +
+            'b;')
         
         # simple comments don't get touched at all
-        test_fragment('a;/*\ncomment\n*/b;', 'a;\n/*\ncomment\n*/\nb;')
-        bt('a;/**\n* javadoc\n*/b;', 'a;\n/**\n * javadoc\n */\nb;')
-        test_fragment('a;/**\n\nno javadoc\n*/b;', 'a;\n/**\n\nno javadoc\n*/\nb;')
+        test_fragment(
+            'a;/*\n' +
+            'comment\n' +
+            '*/b;',
+            #  -- output --
+            'a;\n' +
+            '/*\n' +
+            'comment\n' +
+            '*/\n' +
+            'b;')
+        bt(
+            'a;/**\n' +
+            '* javadoc\n' +
+            '*/b;',
+            #  -- output --
+            'a;\n' +
+            '/**\n' +
+            ' * javadoc\n' +
+            ' */\n' +
+            'b;')
+        test_fragment(
+            'a;/**\n' +
+            '\n' +
+            'no javadoc\n' +
+            '*/b;',
+            #  -- output --
+            'a;\n' +
+            '/**\n' +
+            '\n' +
+            'no javadoc\n' +
+            '*/\n' +
+            'b;')
         
         # comment blocks detected and reindented even w/o javadoc starter
-        bt('a;/*\n* javadoc\n*/b;', 'a;\n/*\n * javadoc\n */\nb;')
+        bt(
+            'a;/*\n' +
+            '* javadoc\n' +
+            '*/b;',
+            #  -- output --
+            'a;\n' +
+            '/*\n' +
+            ' * javadoc\n' +
+            ' */\n' +
+            'b;')
         bt('if(a)break;', 'if (a) break;')
-        bt('if(a){break}', 'if (a) {\n    break\n}')
+        bt(
+            'if(a){break}',
+            #  -- output --
+            'if (a) {\n' +
+            '    break\n' +
+            '}')
         bt('if((a))foo();', 'if ((a)) foo();')
         bt('for(var i=0;;) a', 'for (var i = 0;;) a')
-        bt('for(var i=0;;)\na', 'for (var i = 0;;)\n    a')
+        bt(
+            'for(var i=0;;)\n' +
+            'a',
+            #  -- output --
+            'for (var i = 0;;)\n' +
+            '    a')
         bt('a++;')
         bt('for(;;i++)a()', 'for (;; i++) a()')
-        bt('for(;;i++)\na()', 'for (;; i++)\n    a()')
+        bt(
+            'for(;;i++)\n' +
+            'a()',
+            #  -- output --
+            'for (;; i++)\n' +
+            '    a()')
         bt('for(;;++i)a', 'for (;; ++i) a')
         bt('return(1)', 'return (1)')
-        bt('try{a();}catch(b){c();}finally{d();}', 'try {\n    a();\n} catch (b) {\n    c();\n} finally {\n    d();\n}')
+        bt(
+            'try{a();}catch(b){c();}finally{d();}',
+            #  -- output --
+            'try {\n' +
+            '    a();\n' +
+            '} catch (b) {\n' +
+            '    c();\n' +
+            '} finally {\n' +
+            '    d();\n' +
+            '}')
         
         #  magic function call
         bt('(xx)()')
         
         # another magic function call
         bt('a[1]()')
-        bt('if(a){b();}else if(c) foo();', 'if (a) {\n    b();\n} else if (c) foo();')
-        bt('switch(x) {case 0: case 1: a(); break; default: break}', 'switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}')
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}')
+        bt(
+            'if(a){b();}else if(c) foo();',
+            #  -- output --
+            'if (a) {\n' +
+            '    b();\n' +
+            '} else if (c) foo();')
+        bt(
+            'switch(x) {case 0: case 1: a(); break; default: break}',
+            #  -- output --
+            'switch (x) {\n' +
+            '    case 0:\n' +
+            '    case 1:\n' +
+            '        a();\n' +
+            '        break;\n' +
+            '    default:\n' +
+            '        break\n' +
+            '}')
+        bt(
+            'switch(x){case -1:break;case !y:break;}',
+            #  -- output --
+            'switch (x) {\n' +
+            '    case -1:\n' +
+            '        break;\n' +
+            '    case !y:\n' +
+            '        break;\n' +
+            '}')
         bt('a !== b')
-        bt('if (a) b(); else c();', 'if (a) b();\nelse c();')
+        bt(
+            'if (a) b(); else c();',
+            #  -- output --
+            'if (a) b();\n' +
+            'else c();')
         
         # typical greasemonkey start
-        bt('// comment\n(function something() {})')
+        bt(
+            '// comment\n' +
+            '(function something() {})')
         
         # duplicating newlines
-        bt('{\n\n    x();\n\n}')
+        bt(
+            '{\n' +
+            '\n' +
+            '    x();\n' +
+            '\n' +
+            '}')
         bt('if (a in b) foo();')
         bt('if (a of b) foo();')
         bt('if (a of [1, 2, 3]) foo();')
-        bt('if(X)if(Y)a();else b();else c();', 'if (X)\n    if (Y) a();\n    else b();\nelse c();')
-        bt('if (foo) bar();\nelse break')
+        bt(
+            'if(X)if(Y)a();else b();else c();',
+            #  -- output --
+            'if (X)\n' +
+            '    if (Y) a();\n' +
+            '    else b();\n' +
+            'else c();')
+        bt(
+            'if (foo) bar();\n' +
+            'else break')
         bt('var a, b;')
         bt('var a = new function();')
         test_fragment('new function')
         bt('var a, b')
-        bt('{a:1, b:2}', '{\n    a: 1,\n    b: 2\n}')
-        bt('a={1:[-1],2:[+1]}', 'a = {\n    1: [-1],\n    2: [+1]\n}')
-        bt('var l = {\'a\':\'1\', \'b\':\'2\'}', 'var l = {\n    \'a\': \'1\',\n    \'b\': \'2\'\n}')
+        bt(
+            '{a:1, b:2}',
+            #  -- output --
+            '{\n' +
+            '    a: 1,\n' +
+            '    b: 2\n' +
+            '}')
+        bt(
+            'a={1:[-1],2:[+1]}',
+            #  -- output --
+            'a = {\n' +
+            '    1: [-1],\n' +
+            '    2: [+1]\n' +
+            '}')
+        bt(
+            'var l = {\'a\':\'1\', \'b\':\'2\'}',
+            #  -- output --
+            'var l = {\n' +
+            '    \'a\': \'1\',\n' +
+            '    \'b\': \'2\'\n' +
+            '}')
         bt('if (template.user[n] in bk) foo();')
         bt('return 45')
-        bt('return this.prevObject ||\n\n    this.constructor(null);')
+        bt(
+            'return this.prevObject ||\n' +
+            '\n' +
+            '    this.constructor(null);')
         bt('If[1]')
         bt('Then[1]')
         bt('a = 1;// comment', 'a = 1; // comment')
         bt('a = 1; // comment')
-        bt('a = 1;\n // comment', 'a = 1;\n// comment')
+        bt(
+            'a = 1;\n' +
+            ' // comment',
+            #  -- output --
+            'a = 1;\n' +
+            '// comment')
         bt('a = [-1, -1, -1]')
         bt(
             '// a\n' +
@@ -2874,106 +3769,375 @@ def unicode_char(value):
             '// end-func-comment')
         
         # The exact formatting these should have is open for discussion, but they are at least reasonable
-        bt('a = [ // comment\n    -1, -1, -1\n]')
-        bt('var a = [ // comment\n    -1, -1, -1\n]')
-        bt('a = [ // comment\n    -1, // comment\n    -1, -1\n]')
-        bt('var a = [ // comment\n    -1, // comment\n    -1, -1\n]')
-        bt('o = [{a:b},{c:d}]', 'o = [{\n    a: b\n}, {\n    c: d\n}]')
+        bt(
+            'a = [ // comment\n' +
+            '    -1, -1, -1\n' +
+            ']')
+        bt(
+            'var a = [ // comment\n' +
+            '    -1, -1, -1\n' +
+            ']')
+        bt(
+            'a = [ // comment\n' +
+            '    -1, // comment\n' +
+            '    -1, -1\n' +
+            ']')
+        bt(
+            'var a = [ // comment\n' +
+            '    -1, // comment\n' +
+            '    -1, -1\n' +
+            ']')
+        bt(
+            'o = [{a:b},{c:d}]',
+            #  -- output --
+            'o = [{\n' +
+            '    a: b\n' +
+            '}, {\n' +
+            '    c: d\n' +
+            '}]')
         
         # was: extra space appended
-        bt('if (a) {\n    do();\n}')
+        bt(
+            'if (a) {\n' +
+            '    do();\n' +
+            '}')
         
         # if/else statement with empty body
-        bt('if (a) {\n// comment\n}else{\n// comment\n}', 'if (a) {\n    // comment\n} else {\n    // comment\n}')
-        
-        # multiple comments indentation
-        bt('if (a) {\n// comment\n// comment\n}', 'if (a) {\n    // comment\n    // comment\n}')
-        bt('if (a) b() else c();', 'if (a) b()\nelse c();')
-        bt('if (a) b() else if c() d();', 'if (a) b()\nelse if c() d();')
+        bt(
+            'if (a) {\n' +
+            '// comment\n' +
+            '}else{\n' +
+            '// comment\n' +
+            '}',
+            #  -- output --
+            'if (a) {\n' +
+            '    // comment\n' +
+            '} else {\n' +
+            '    // comment\n' +
+            '}')
+        
+        # multiple comments indentation
+        bt(
+            'if (a) {\n' +
+            '// comment\n' +
+            '// comment\n' +
+            '}',
+            #  -- output --
+            'if (a) {\n' +
+            '    // comment\n' +
+            '    // comment\n' +
+            '}')
+        bt(
+            'if (a) b() else c();',
+            #  -- output --
+            'if (a) b()\n' +
+            'else c();')
+        bt(
+            'if (a) b() else if c() d();',
+            #  -- output --
+            'if (a) b()\n' +
+            'else if c() d();')
         bt('{}')
-        bt('{\n\n}')
-        bt('do { a(); } while ( 1 );', 'do {\n    a();\n} while (1);')
+        bt(
+            '{\n' +
+            '\n' +
+            '}')
+        bt(
+            'do { a(); } while ( 1 );',
+            #  -- output --
+            'do {\n' +
+            '    a();\n' +
+            '} while (1);')
         bt('do {} while (1);')
-        bt('do {\n} while (1);', 'do {} while (1);')
-        bt('do {\n\n} while (1);')
+        bt(
+            'do {\n' +
+            '} while (1);',
+            #  -- output --
+            'do {} while (1);')
+        bt(
+            'do {\n' +
+            '\n' +
+            '} while (1);')
         bt('var a = x(a, b, c)')
-        bt('delete x if (a) b();', 'delete x\nif (a) b();')
-        bt('delete x[x] if (a) b();', 'delete x[x]\nif (a) b();')
+        bt(
+            'delete x if (a) b();',
+            #  -- output --
+            'delete x\n' +
+            'if (a) b();')
+        bt(
+            'delete x[x] if (a) b();',
+            #  -- output --
+            'delete x[x]\n' +
+            'if (a) b();')
         bt('for(var a=1,b=2)d', 'for (var a = 1, b = 2) d')
         bt('for(var a=1,b=2,c=3) d', 'for (var a = 1, b = 2, c = 3) d')
-        bt('for(var a=1,b=2,c=3;d<3;d++)\ne', 'for (var a = 1, b = 2, c = 3; d < 3; d++)\n    e')
-        bt('function x(){(a||b).c()}', 'function x() {\n    (a || b).c()\n}')
-        bt('function x(){return - 1}', 'function x() {\n    return -1\n}')
-        bt('function x(){return ! a}', 'function x() {\n    return !a\n}')
+        bt(
+            'for(var a=1,b=2,c=3;d<3;d++)\n' +
+            'e',
+            #  -- output --
+            'for (var a = 1, b = 2, c = 3; d < 3; d++)\n' +
+            '    e')
+        bt(
+            'function x(){(a||b).c()}',
+            #  -- output --
+            'function x() {\n' +
+            '    (a || b).c()\n' +
+            '}')
+        bt(
+            'function x(){return - 1}',
+            #  -- output --
+            'function x() {\n' +
+            '    return -1\n' +
+            '}')
+        bt(
+            'function x(){return ! a}',
+            #  -- output --
+            'function x() {\n' +
+            '    return !a\n' +
+            '}')
         bt('x => x')
         bt('(x) => x')
-        bt('x => { x }', 'x => {\n    x\n}')
-        bt('(x) => { x }', '(x) => {\n    x\n}')
+        bt(
+            'x => { x }',
+            #  -- output --
+            'x => {\n' +
+            '    x\n' +
+            '}')
+        bt(
+            '(x) => { x }',
+            #  -- output --
+            '(x) => {\n' +
+            '    x\n' +
+            '}')
         
         # a common snippet in jQuery plugins
         bt(
             'settings = $.extend({},defaults,settings);',
+            #  -- output --
             'settings = $.extend({}, defaults, settings);')
         bt('$http().then().finally().default()')
-        bt('$http()\n.then()\n.finally()\n.default()', '$http()\n    .then()\n    .finally()\n    .default()')
+        bt(
+            '$http()\n' +
+            '.then()\n' +
+            '.finally()\n' +
+            '.default()',
+            #  -- output --
+            '$http()\n' +
+            '    .then()\n' +
+            '    .finally()\n' +
+            '    .default()')
         bt('$http().when.in.new.catch().throw()')
-        bt('$http()\n.when\n.in\n.new\n.catch()\n.throw()', '$http()\n    .when\n    .in\n    .new\n    .catch()\n    .throw()')
-        bt('{xxx;}()', '{\n    xxx;\n}()')
-        bt('a = \'a\'\nb = \'b\'')
+        bt(
+            '$http()\n' +
+            '.when\n' +
+            '.in\n' +
+            '.new\n' +
+            '.catch()\n' +
+            '.throw()',
+            #  -- output --
+            '$http()\n' +
+            '    .when\n' +
+            '    .in\n' +
+            '    .new\n' +
+            '    .catch()\n' +
+            '    .throw()')
+        bt(
+            '{xxx;}()',
+            #  -- output --
+            '{\n' +
+            '    xxx;\n' +
+            '}()')
+        bt(
+            'a = \'a\'\n' +
+            'b = \'b\'')
         bt('a = /reg/exp')
         bt('a = /reg/')
         bt('/abc/.test()')
         bt('/abc/i.test()')
-        bt('{/abc/i.test()}', '{\n    /abc/i.test()\n}')
+        bt(
+            '{/abc/i.test()}',
+            #  -- output --
+            '{\n' +
+            '    /abc/i.test()\n' +
+            '}')
         bt('var x=(a)/a;', 'var x = (a) / a;')
         bt('x != -1')
         bt('for (; s-->0;)t', 'for (; s-- > 0;) t')
         bt('for (; s++>0;)u', 'for (; s++ > 0;) u')
         bt('a = s++>s--;', 'a = s++ > s--;')
         bt('a = s++>--s;', 'a = s++ > --s;')
-        bt('{x=#1=[]}', '{\n    x = #1=[]\n}')
-        bt('{a:#1={}}', '{\n    a: #1={}\n}')
-        bt('{a:#1#}', '{\n    a: #1#\n}')
+        bt(
+            '{x=#1=[]}',
+            #  -- output --
+            '{\n' +
+            '    x = #1=[]\n' +
+            '}')
+        bt(
+            '{a:#1={}}',
+            #  -- output --
+            '{\n' +
+            '    a: #1={}\n' +
+            '}')
+        bt(
+            '{a:#1#}',
+            #  -- output --
+            '{\n' +
+            '    a: #1#\n' +
+            '}')
         test_fragment('"incomplete-string')
         test_fragment('\'incomplete-string')
         test_fragment('/incomplete-regex')
         test_fragment('`incomplete-template-string')
-        test_fragment('{a:1},{a:2}', '{\n    a: 1\n}, {\n    a: 2\n}')
-        test_fragment('var ary=[{a:1}, {a:2}];', 'var ary = [{\n    a: 1\n}, {\n    a: 2\n}];')
+        test_fragment(
+            '{a:1},{a:2}',
+            #  -- output --
+            '{\n' +
+            '    a: 1\n' +
+            '}, {\n' +
+            '    a: 2\n' +
+            '}')
+        test_fragment(
+            'var ary=[{a:1}, {a:2}];',
+            #  -- output --
+            'var ary = [{\n' +
+            '    a: 1\n' +
+            '}, {\n' +
+            '    a: 2\n' +
+            '}];')
         
         # incomplete
-        test_fragment('{a:#1', '{\n    a: #1')
+        test_fragment(
+            '{a:#1',
+            #  -- output --
+            '{\n' +
+            '    a: #1')
         
         # incomplete
-        test_fragment('{a:#', '{\n    a: #')
+        test_fragment(
+            '{a:#',
+            #  -- output --
+            '{\n' +
+            '    a: #')
         
         # incomplete
-        test_fragment('}}}', '}\n}\n}')
-        test_fragment('<!--\nvoid();\n// -->')
+        test_fragment(
+            '}}}',
+            #  -- output --
+            '}\n' +
+            '}\n' +
+            '}')
+        test_fragment(
+            '<!--\n' +
+            'void();\n' +
+            '// -->')
         
         # incomplete regexp
         test_fragment('a=/regexp', 'a = /regexp')
-        bt('{a:#1=[],b:#1#,c:#999999#}', '{\n    a: #1=[],\n    b: #1#,\n    c: #999999#\n}')
-        bt('do{x()}while(a>1)', 'do {\n    x()\n} while (a > 1)')
-        bt('x(); /reg/exp.match(something)', 'x();\n/reg/exp.match(something)')
-        test_fragment('something();(', 'something();\n(')
-        test_fragment('#!she/bangs, she bangs\nf=1', '#!she/bangs, she bangs\n\nf = 1')
-        test_fragment('#!she/bangs, she bangs\n\nf=1', '#!she/bangs, she bangs\n\nf = 1')
-        test_fragment('#!she/bangs, she bangs\n\n/* comment */')
-        test_fragment('#!she/bangs, she bangs\n\n\n/* comment */')
+        bt(
+            '{a:#1=[],b:#1#,c:#999999#}',
+            #  -- output --
+            '{\n' +
+            '    a: #1=[],\n' +
+            '    b: #1#,\n' +
+            '    c: #999999#\n' +
+            '}')
+        bt(
+            'do{x()}while(a>1)',
+            #  -- output --
+            'do {\n' +
+            '    x()\n' +
+            '} while (a > 1)')
+        bt(
+            'x(); /reg/exp.match(something)',
+            #  -- output --
+            'x();\n' +
+            '/reg/exp.match(something)')
+        test_fragment(
+            'something();(',
+            #  -- output --
+            'something();\n' +
+            '(')
+        test_fragment(
+            '#!she/bangs, she bangs\n' +
+            'f=1',
+            #  -- output --
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            'f = 1')
+        test_fragment(
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            'f=1',
+            #  -- output --
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            'f = 1')
+        test_fragment(
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            '/* comment */')
+        test_fragment(
+            '#!she/bangs, she bangs\n' +
+            '\n' +
+            '\n' +
+            '/* comment */')
         test_fragment('#')
         test_fragment('#!')
         bt('function namespace::something()')
-        test_fragment('<!--\nsomething();\n-->')
-        test_fragment('<!--\nif(i<0){bla();}\n-->', '<!--\nif (i < 0) {\n    bla();\n}\n-->')
-        bt('{foo();--bar;}', '{\n    foo();\n    --bar;\n}')
-        bt('{foo();++bar;}', '{\n    foo();\n    ++bar;\n}')
-        bt('{--bar;}', '{\n    --bar;\n}')
-        bt('{++bar;}', '{\n    ++bar;\n}')
+        test_fragment(
+            '<!--\n' +
+            'something();\n' +
+            '-->')
+        test_fragment(
+            '<!--\n' +
+            'if(i<0){bla();}\n' +
+            '-->',
+            #  -- output --
+            '<!--\n' +
+            'if (i < 0) {\n' +
+            '    bla();\n' +
+            '}\n' +
+            '-->')
+        bt(
+            '{foo();--bar;}',
+            #  -- output --
+            '{\n' +
+            '    foo();\n' +
+            '    --bar;\n' +
+            '}')
+        bt(
+            '{foo();++bar;}',
+            #  -- output --
+            '{\n' +
+            '    foo();\n' +
+            '    ++bar;\n' +
+            '}')
+        bt(
+            '{--bar;}',
+            #  -- output --
+            '{\n' +
+            '    --bar;\n' +
+            '}')
+        bt(
+            '{++bar;}',
+            #  -- output --
+            '{\n' +
+            '    ++bar;\n' +
+            '}')
         bt('if(true)++a;', 'if (true) ++a;')
-        bt('if(true)\n++a;', 'if (true)\n    ++a;')
+        bt(
+            'if(true)\n' +
+            '++a;',
+            #  -- output --
+            'if (true)\n' +
+            '    ++a;')
         bt('if(true)--a;', 'if (true) --a;')
-        bt('if(true)\n--a;', 'if (true)\n    --a;')
+        bt(
+            'if(true)\n' +
+            '--a;',
+            #  -- output --
+            'if (true)\n' +
+            '    --a;')
         bt('elem[array]++;')
         bt('elem++ * elem[array]++;')
         bt('elem-- * -elem[array]++;')
@@ -2983,106 +4147,510 @@ def unicode_char(value):
         bt('elem-- - +elem[array]++;')
         
         # Handling of newlines around unary ++ and -- operators
-        bt('{foo\n++bar;}', '{\n    foo\n    ++bar;\n}')
-        bt('{foo++\nbar;}', '{\n    foo++\n    bar;\n}')
+        bt(
+            '{foo\n' +
+            '++bar;}',
+            #  -- output --
+            '{\n' +
+            '    foo\n' +
+            '    ++bar;\n' +
+            '}')
+        bt(
+            '{foo++\n' +
+            'bar;}',
+            #  -- output --
+            '{\n' +
+            '    foo++\n' +
+            '    bar;\n' +
+            '}')
         
         # This is invalid, but harder to guard against. Issue #203.
-        bt('{foo\n++\nbar;}', '{\n    foo\n    ++\n    bar;\n}')
+        bt(
+            '{foo\n' +
+            '++\n' +
+            'bar;}',
+            #  -- output --
+            '{\n' +
+            '    foo\n' +
+            '    ++\n' +
+            '    bar;\n' +
+            '}')
         
         # regexps
-        bt('a(/abc\\/\\/def/);b()', 'a(/abc\\/\\/def/);\nb()')
-        bt('a(/a[b\\[\\]c]d/);b()', 'a(/a[b\\[\\]c]d/);\nb()')
+        bt(
+            'a(/abc\\/\\/def/);b()',
+            #  -- output --
+            'a(/abc\\/\\/def/);\n' +
+            'b()')
+        bt(
+            'a(/a[b\\[\\]c]d/);b()',
+            #  -- output --
+            'a(/a[b\\[\\]c]d/);\n' +
+            'b()')
         
         # incomplete char class
         test_fragment('a(/a[b\\[')
         
         # allow unescaped / in char classes
-        bt('a(/[a/b]/);b()', 'a(/[a/b]/);\nb()')
+        bt(
+            'a(/[a/b]/);b()',
+            #  -- output --
+            'a(/[a/b]/);\n' +
+            'b()')
         bt('typeof /foo\\//;')
         bt('throw /foo\\//;')
         bt('do /foo\\//;')
         bt('return /foo\\//;')
-        bt('switch (a) {\n    case /foo\\//:\n        b\n}')
-        bt('if (a) /foo\\//\nelse /foo\\//;')
+        bt(
+            'switch (a) {\n' +
+            '    case /foo\\//:\n' +
+            '        b\n' +
+            '}')
+        bt(
+            'if (a) /foo\\//\n' +
+            'else /foo\\//;')
         bt('if (foo) /regex/.test();')
         bt('for (index in [1, 2, 3]) /^test$/i.test(s)')
-        bt('function foo() {\n    return [\n        "one",\n        "two"\n    ];\n}')
-        bt('a=[[1,2],[4,5],[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    [7, 8]\n]')
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]')
-        bt('a=[[1,2],[4,5],function(){},function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    function() {},\n    [7, 8]\n]')
-        bt('a=[[1,2],[4,5],function(){},[7,8]]', 'a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]')
+        bt(
+            'function foo() {\n' +
+            '    return [\n' +
+            '        "one",\n' +
+            '        "two"\n' +
+            '    ];\n' +
+            '}')
+        bt(
+            'a=[[1,2],[4,5],[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n' +
+            '    [4, 5],\n' +
+            '    [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n' +
+            '    [4, 5],\n' +
+            '    function() {},\n' +
+            '    [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],function(){},function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n' +
+            '    [4, 5],\n' +
+            '    function() {},\n' +
+            '    function() {},\n' +
+            '    [7, 8]\n' +
+            ']')
+        bt(
+            'a=[[1,2],[4,5],function(){},[7,8]]',
+            #  -- output --
+            'a = [\n' +
+            '    [1, 2],\n' +
+            '    [4, 5],\n' +
+            '    function() {},\n' +
+            '    [7, 8]\n' +
+            ']')
         bt('a=[b,c,function(){},function(){},d]', 'a = [b, c, function() {}, function() {}, d]')
-        bt('a=[b,c,\nfunction(){},function(){},d]', 'a = [b, c,\n    function() {},\n    function() {},\n    d\n]')
+        bt(
+            'a=[b,c,\n' +
+            'function(){},function(){},d]',
+            #  -- output --
+            'a = [b, c,\n' +
+            '    function() {},\n' +
+            '    function() {},\n' +
+            '    d\n' +
+            ']')
         bt('a=[a[1],b[4],c[d[7]]]', 'a = [a[1], b[4], c[d[7]]]')
         bt('[1,2,[3,4,[5,6],7],8]', '[1, 2, [3, 4, [5, 6], 7], 8]')
-        bt('[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]', '[\n    [\n        ["1", "2"],\n        ["3", "4"]\n    ],\n    [\n        ["5", "6", "7"],\n        ["8", "9", "0"]\n    ],\n    [\n        ["1", "2", "3"],\n        ["4", "5", "6", "7"],\n        ["8", "9", "0"]\n    ]\n]')
-        bt('{[x()[0]];indent;}', '{\n    [x()[0]];\n    indent;\n}')
-        bt('/*\n foo trailing space    \n * bar trailing space   \n**/')
-        bt('{\n    /*\n    foo    \n    * bar    \n    */\n}')
+        bt(
+            '[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]',
+            #  -- output --
+            '[\n' +
+            '    [\n' +
+            '        ["1", "2"],\n' +
+            '        ["3", "4"]\n' +
+            '    ],\n' +
+            '    [\n' +
+            '        ["5", "6", "7"],\n' +
+            '        ["8", "9", "0"]\n' +
+            '    ],\n' +
+            '    [\n' +
+            '        ["1", "2", "3"],\n' +
+            '        ["4", "5", "6", "7"],\n' +
+            '        ["8", "9", "0"]\n' +
+            '    ]\n' +
+            ']')
+        bt(
+            '{[x()[0]];indent;}',
+            #  -- output --
+            '{\n' +
+            '    [x()[0]];\n' +
+            '    indent;\n' +
+            '}')
+        bt(
+            '/*\n' +
+            ' foo trailing space    \n' +
+            ' * bar trailing space   \n' +
+            '**/')
+        bt(
+            '{\n' +
+            '    /*\n' +
+            '    foo    \n' +
+            '    * bar    \n' +
+            '    */\n' +
+            '}')
         bt('return ++i')
         bt('return !!x')
         bt('return !x')
         bt('return [1,2]', 'return [1, 2]')
         bt('return;')
-        bt('return\nfunc')
+        bt(
+            'return\n' +
+            'func')
         bt('catch(e)', 'catch (e)')
-        bt('var a=1,b={foo:2,bar:3},{baz:4,wham:5},c=4;', 'var a = 1,\n    b = {\n        foo: 2,\n        bar: 3\n    },\n    {\n        baz: 4,\n        wham: 5\n    }, c = 4;')
-        bt('var a=1,b={foo:2,bar:3},{baz:4,wham:5},\nc=4;', 'var a = 1,\n    b = {\n        foo: 2,\n        bar: 3\n    },\n    {\n        baz: 4,\n        wham: 5\n    },\n    c = 4;')
+        bt(
+            'var a=1,b={foo:2,bar:3},{baz:4,wham:5},c=4;',
+            #  -- output --
+            'var a = 1,\n' +
+            '    b = {\n' +
+            '        foo: 2,\n' +
+            '        bar: 3\n' +
+            '    },\n' +
+            '    {\n' +
+            '        baz: 4,\n' +
+            '        wham: 5\n' +
+            '    }, c = 4;')
+        bt(
+            'var a=1,b={foo:2,bar:3},{baz:4,wham:5},\n' +
+            'c=4;',
+            #  -- output --
+            'var a = 1,\n' +
+            '    b = {\n' +
+            '        foo: 2,\n' +
+            '        bar: 3\n' +
+            '    },\n' +
+            '    {\n' +
+            '        baz: 4,\n' +
+            '        wham: 5\n' +
+            '    },\n' +
+            '    c = 4;')
         
         # inline comment
         bt(
             'function x(/*int*/ start, /*string*/ foo)',
+            #  -- output --
             'function x( /*int*/ start, /*string*/ foo)')
         
         # javadoc comment
-        bt('/**\n* foo\n*/', '/**\n * foo\n */')
-        bt('{\n/**\n* foo\n*/\n}', '{\n    /**\n     * foo\n     */\n}')
+        bt(
+            '/**\n' +
+            '* foo\n' +
+            '*/',
+            #  -- output --
+            '/**\n' +
+            ' * foo\n' +
+            ' */')
+        bt(
+            '{\n' +
+            '/**\n' +
+            '* foo\n' +
+            '*/\n' +
+            '}',
+            #  -- output --
+            '{\n' +
+            '    /**\n' +
+            '     * foo\n' +
+            '     */\n' +
+            '}')
         
         # starless block comment
-        bt('/**\nfoo\n*/')
-        bt('/**\nfoo\n**/')
-        bt('/**\nfoo\nbar\n**/')
-        bt('/**\nfoo\n\nbar\n**/')
-        bt('/**\nfoo\n    bar\n**/')
-        bt('{\n/**\nfoo\n*/\n}', '{\n    /**\n    foo\n    */\n}')
-        bt('{\n/**\nfoo\n**/\n}', '{\n    /**\n    foo\n    **/\n}')
-        bt('{\n/**\nfoo\nbar\n**/\n}', '{\n    /**\n    foo\n    bar\n    **/\n}')
-        bt('{\n/**\nfoo\n\nbar\n**/\n}', '{\n    /**\n    foo\n\n    bar\n    **/\n}')
-        bt('{\n/**\nfoo\n    bar\n**/\n}', '{\n    /**\n    foo\n        bar\n    **/\n}')
-        bt('{\n    /**\n    foo\nbar\n    **/\n}')
-        bt('var a,b,c=1,d,e,f=2;', 'var a, b, c = 1,\n    d, e, f = 2;')
-        bt('var a,b,c=[],d,e,f=2;', 'var a, b, c = [],\n    d, e, f = 2;')
-        bt('function() {\n    var a, b, c, d, e = [],\n        f;\n}')
-        bt('do/regexp/;\nwhile(1);', 'do /regexp/;\nwhile (1);')
-        bt('var a = a,\na;\nb = {\nb\n}', 'var a = a,\n    a;\nb = {\n    b\n}')
-        bt('var a = a,\n    /* c */\n    b;')
-        bt('var a = a,\n    // c\n    b;')
+        bt(
+            '/**\n' +
+            'foo\n' +
+            '*/')
+        bt(
+            '/**\n' +
+            'foo\n' +
+            '**/')
+        bt(
+            '/**\n' +
+            'foo\n' +
+            'bar\n' +
+            '**/')
+        bt(
+            '/**\n' +
+            'foo\n' +
+            '\n' +
+            'bar\n' +
+            '**/')
+        bt(
+            '/**\n' +
+            'foo\n' +
+            '    bar\n' +
+            '**/')
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            '*/\n' +
+            '}',
+            #  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '    */\n' +
+            '}')
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            '**/\n' +
+            '}',
+            #  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '    **/\n' +
+            '}')
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            'bar\n' +
+            '**/\n' +
+            '}',
+            #  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '    bar\n' +
+            '    **/\n' +
+            '}')
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            '\n' +
+            'bar\n' +
+            '**/\n' +
+            '}',
+            #  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '\n' +
+            '    bar\n' +
+            '    **/\n' +
+            '}')
+        bt(
+            '{\n' +
+            '/**\n' +
+            'foo\n' +
+            '    bar\n' +
+            '**/\n' +
+            '}',
+            #  -- output --
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            '        bar\n' +
+            '    **/\n' +
+            '}')
+        bt(
+            '{\n' +
+            '    /**\n' +
+            '    foo\n' +
+            'bar\n' +
+            '    **/\n' +
+            '}')
+        bt(
+            'var a,b,c=1,d,e,f=2;',
+            #  -- output --
+            'var a, b, c = 1,\n' +
+            '    d, e, f = 2;')
+        bt(
+            'var a,b,c=[],d,e,f=2;',
+            #  -- output --
+            'var a, b, c = [],\n' +
+            '    d, e, f = 2;')
+        bt(
+            'function() {\n' +
+            '    var a, b, c, d, e = [],\n' +
+            '        f;\n' +
+            '}')
+        bt(
+            'do/regexp/;\n' +
+            'while(1);',
+            #  -- output --
+            'do /regexp/;\n' +
+            'while (1);')
+        bt(
+            'var a = a,\n' +
+            'a;\n' +
+            'b = {\n' +
+            'b\n' +
+            '}',
+            #  -- output --
+            'var a = a,\n' +
+            '    a;\n' +
+            'b = {\n' +
+            '    b\n' +
+            '}')
+        bt(
+            'var a = a,\n' +
+            '    /* c */\n' +
+            '    b;')
+        bt(
+            'var a = a,\n' +
+            '    // c\n' +
+            '    b;')
         
         # weird element referencing
         bt('foo.("bar");')
-        bt('if (a) a()\nelse b()\nnewline()')
-        bt('if (a) a()\nnewline()')
+        bt(
+            'if (a) a()\n' +
+            'else b()\n' +
+            'newline()')
+        bt(
+            'if (a) a()\n' +
+            'newline()')
         bt('a=typeof(x)', 'a = typeof(x)')
-        bt('var a = function() {\n        return null;\n    },\n    b = false;')
-        bt('var a = function() {\n    func1()\n}')
-        bt('var a = function() {\n    func1()\n}\nvar b = function() {\n    func2()\n}')
+        bt(
+            'var a = function() {\n' +
+            '        return null;\n' +
+            '    },\n' +
+            '    b = false;')
+        bt(
+            'var a = function() {\n' +
+            '    func1()\n' +
+            '}')
+        bt(
+            'var a = function() {\n' +
+            '    func1()\n' +
+            '}\n' +
+            'var b = function() {\n' +
+            '    func2()\n' +
+            '}')
         
         # code with and without semicolons
         bt(
-            'var whatever = require("whatever");\nfunction() {\n    a = 6;\n}',
-            'var whatever = require("whatever");\n\nfunction() {\n    a = 6;\n}')
-        bt('var whatever = require("whatever")\nfunction() {\n    a = 6\n}', 'var whatever = require("whatever")\n\nfunction() {\n    a = 6\n}')
-        bt('{"x":[{"a":1,"b":3},\n7,8,8,8,8,{"b":99},{"a":11}]}', '{\n    "x": [{\n            "a": 1,\n            "b": 3\n        },\n        7, 8, 8, 8, 8, {\n            "b": 99\n        }, {\n            "a": 11\n        }\n    ]\n}')
-        bt('{"x":[{"a":1,"b":3},7,8,8,8,8,{"b":99},{"a":11}]}', '{\n    "x": [{\n        "a": 1,\n        "b": 3\n    }, 7, 8, 8, 8, 8, {\n        "b": 99\n    }, {\n        "a": 11\n    }]\n}')
-        bt('{"1":{"1a":"1b"},"2"}', '{\n    "1": {\n        "1a": "1b"\n    },\n    "2"\n}')
-        bt('{a:{a:b},c}', '{\n    a: {\n        a: b\n    },\n    c\n}')
-        bt('{[y[a]];keep_indent;}', '{\n    [y[a]];\n    keep_indent;\n}')
-        bt('if (x) {y} else { if (x) {y}}', 'if (x) {\n    y\n} else {\n    if (x) {\n        y\n    }\n}')
-        bt('if (foo) one()\ntwo()\nthree()')
-        bt('if (1 + foo() && bar(baz()) / 2) one()\ntwo()\nthree()')
-        bt('if (1 + foo() && bar(baz()) / 2) one();\ntwo();\nthree();')
-        bt('var a=1,b={bang:2},c=3;', 'var a = 1,\n    b = {\n        bang: 2\n    },\n    c = 3;')
-        bt('var a={bing:1},b=2,c=3;', 'var a = {\n        bing: 1\n    },\n    b = 2,\n    c = 3;')
+            'var whatever = require("whatever");\n' +
+            'function() {\n' +
+            '    a = 6;\n' +
+            '}',
+            #  -- output --
+            'var whatever = require("whatever");\n' +
+            '\n' +
+            'function() {\n' +
+            '    a = 6;\n' +
+            '}')
+        bt(
+            'var whatever = require("whatever")\n' +
+            'function() {\n' +
+            '    a = 6\n' +
+            '}',
+            #  -- output --
+            'var whatever = require("whatever")\n' +
+            '\n' +
+            'function() {\n' +
+            '    a = 6\n' +
+            '}')
+        bt(
+            '{"x":[{"a":1,"b":3},\n' +
+            '7,8,8,8,8,{"b":99},{"a":11}]}',
+            #  -- output --
+            '{\n' +
+            '    "x": [{\n' +
+            '            "a": 1,\n' +
+            '            "b": 3\n' +
+            '        },\n' +
+            '        7, 8, 8, 8, 8, {\n' +
+            '            "b": 99\n' +
+            '        }, {\n' +
+            '            "a": 11\n' +
+            '        }\n' +
+            '    ]\n' +
+            '}')
+        bt(
+            '{"x":[{"a":1,"b":3},7,8,8,8,8,{"b":99},{"a":11}]}',
+            #  -- output --
+            '{\n' +
+            '    "x": [{\n' +
+            '        "a": 1,\n' +
+            '        "b": 3\n' +
+            '    }, 7, 8, 8, 8, 8, {\n' +
+            '        "b": 99\n' +
+            '    }, {\n' +
+            '        "a": 11\n' +
+            '    }]\n' +
+            '}')
+        bt(
+            '{"1":{"1a":"1b"},"2"}',
+            #  -- output --
+            '{\n' +
+            '    "1": {\n' +
+            '        "1a": "1b"\n' +
+            '    },\n' +
+            '    "2"\n' +
+            '}')
+        bt(
+            '{a:{a:b},c}',
+            #  -- output --
+            '{\n' +
+            '    a: {\n' +
+            '        a: b\n' +
+            '    },\n' +
+            '    c\n' +
+            '}')
+        bt(
+            '{[y[a]];keep_indent;}',
+            #  -- output --
+            '{\n' +
+            '    [y[a]];\n' +
+            '    keep_indent;\n' +
+            '}')
+        bt(
+            'if (x) {y} else { if (x) {y}}',
+            #  -- output --
+            'if (x) {\n' +
+            '    y\n' +
+            '} else {\n' +
+            '    if (x) {\n' +
+            '        y\n' +
+            '    }\n' +
+            '}')
+        bt(
+            'if (foo) one()\n' +
+            'two()\n' +
+            'three()')
+        bt(
+            'if (1 + foo() && bar(baz()) / 2) one()\n' +
+            'two()\n' +
+            'three()')
+        bt(
+            'if (1 + foo() && bar(baz()) / 2) one();\n' +
+            'two();\n' +
+            'three();')
+        bt(
+            'var a=1,b={bang:2},c=3;',
+            #  -- output --
+            'var a = 1,\n' +
+            '    b = {\n' +
+            '        bang: 2\n' +
+            '    },\n' +
+            '    c = 3;')
+        bt(
+            'var a={bing:1},b=2,c=3;',
+            #  -- output --
+            'var a = {\n' +
+            '        bing: 1\n' +
+            '    },\n' +
+            '    b = 2,\n' +
+            '    c = 3;')
 
 
 
diff --git a/test/data/css/tests.js b/test/data/css/tests.js
index 5759d3f65..c886b7ae4 100644
--- a/test/data/css/tests.js
+++ b/test/data/css/tests.js
@@ -275,7 +275,7 @@ exports.test_data = {
             { input: '.tabs (   )   {    }', output: '.tabs () {}' },
             { input: '.tabs(   )   {    }', output: '.tabs() {}' },
             { input: '.tabs  (t, t2)  \n{\n  key: val(p1  ,p2);  \n  }', output: '.tabs (t, t2) {\n\tkey: val(p1, p2);\n}' },
-            { input: '.box-shadow(@shadow: 0 1px 3px rgba(0, 0, 0, .25)) {\n\t-webkit-box-shadow: @shadow;\n\t-moz-box-shadow: @shadow;\n\tbox-shadow: @shadow;\n}' }
+            { unchanged: '.box-shadow(@shadow: 0 1px 3px rgba(0, 0, 0, .25)) {\n\t-webkit-box-shadow: @shadow;\n\t-moz-box-shadow: @shadow;\n\tbox-shadow: @shadow;\n}' }
         ],
     }, {
         name: "Comments",
diff --git a/test/data/javascript/tests.js b/test/data/javascript/tests.js
index ed1911e8e..bd81c41ee 100644
--- a/test/data/javascript/tests.js
+++ b/test/data/javascript/tests.js
@@ -40,9 +40,9 @@ exports.test_data = {
         name: "Unicode Support",
         description: "",
         tests: [{
-            input: "var ' + unicode_char(3232) + '_' + unicode_char(3232) + ' = \"hi\";"
+            unchanged: "var ' + unicode_char(3232) + '_' + unicode_char(3232) + ' = \"hi\";"
         }, {
-            input: [
+            unchanged: [
                 "var ' + unicode_char(228) + 'x = {",
                 "    ' + unicode_char(228) + 'rgerlich: true",
                 "};"
@@ -54,8 +54,8 @@ exports.test_data = {
         tests: [
             { unchanged: '`This is a ${template} string.`' },
             { unchanged: '`This\n  is\n  a\n  ${template}\n  string.`' },
-            { unchanged: 'a = `This is a continuation\\\nstring.`' },
-            { unchanged: 'a = "This is a continuation\\\nstring."' },
+            { unchanged: 'a = `This is a continuation\\\\\nstring.`' },
+            { unchanged: 'a = "This is a continuation\\\\\nstring."' },
             { unchanged: '`SELECT\n  nextval(\\\'${this.options.schema ? `${this.options.schema}.` : \\\'\\\'}"${this.tableName}_${this.autoIncrementField}_seq"\\\'::regclass\n  ) nextval;`' },
             {
                 comment: 'Tests for #1030',
@@ -339,7 +339,7 @@ exports.test_data = {
             { input: 'var a=1, b=c[d], e=6;', output: 'var a = 1{{c1}}b = c[d]{{c1}}e = 6;' },
             { input: "for(var a=1,b=2,c=3;d<3;d++)\ne", output: "for (var a = 1, b = 2, c = 3; d < 3; d++)\n    e" },
             { input: "for(var a=1,b=2,\nc=3;d<3;d++)\ne", output: "for (var a = 1, b = 2{{c2}}c = 3; d < 3; d++)\n    e" },
-            { input: 'function foo() {\n    return [\n        "one"{{c2}}"two"\n    ];\n}' },
+            { unchanged: 'function foo() {\n    return [\n        "one"{{c2}}"two"\n    ];\n}' },
             { input: 'a=[[1,2],[4,5],[7,8]]', output: "a = [\n    [1, 2]{{c1}}[4, 5]{{c1}}[7, 8]\n]" },
             { input: 'a=[[1,2],[4,5],[7,8],]', output: "a = [\n    [1, 2]{{c1}}[4, 5]{{c1}}[7, 8]{{c0}}]" },
             {
@@ -730,12 +730,12 @@ exports.test_data = {
         name: "Async / await tests",
         description: "ES7 async / await tests",
         tests: [
-            { input: "async function foo() {}" },
-            { input: "let w = async function foo() {}" },
-            { input: "async function foo() {}\nvar x = await foo();" },
+            { unchanged: "async function foo() {}" },
+            { unchanged: "let w = async function foo() {}" },
+            { unchanged: "async function foo() {}\nvar x = await foo();" },
             {
                 comment: "async function as an input to another function",
-                input: "wrapper(async function foo() {})"
+                unchanged: "wrapper(async function foo() {})"
             },
             {
                 comment: "await on inline anonymous function. should have a space after await",
@@ -744,7 +744,7 @@ exports.test_data = {
             },
             {
                 comment: "ensure that this doesn't break anyone with the async library",
-                input: "async.map(function(t) {})"
+                unchanged: "async.map(function(t) {})"
             }
         ]
     }, {
@@ -2571,7 +2571,7 @@ exports.test_data = {
             { input: 'a        =          1', output: 'a = 1' },
             { input: 'a=1', output: 'a = 1' },
             { unchanged: '(3) / 2' },
-            { input: '["a", "b"].join("")' },
+            { unchanged: '["a", "b"].join("")' },
             { unchanged: 'a();\n\nb();' },
             { input: 'var a = 1 var b = 2', output: 'var a = 1\nvar b = 2' },
             { input: 'var a=1, b=c[d], e=6;', output: 'var a = 1,\n    b = c[d],\n    e = 6;' },
@@ -2591,7 +2591,7 @@ exports.test_data = {
             { input: 'var a = 1 if (2) 3;', output: 'var a = 1\nif (2) 3;' },
             { unchanged: 'a = a + 1' },
             { unchanged: 'a = a == 1' },
-            { input: '/12345[^678]*9+/.match(a)' },
+            { unchanged: '/12345[^678]*9+/.match(a)' },
             { unchanged: 'a /= 5' },
             { unchanged: 'a = 0.5 * 3' },
             { unchanged: 'a *= 10.55' },
@@ -2713,7 +2713,7 @@ exports.test_data = {
             { input: 'x={a:1,b:w=="foo"?x:y,c:z}', output: 'x = {\n    a: 1,\n    b: w == "foo" ? x : y,\n    c: z\n}' },
             { input: 'x=a?b?c?d:e:f:g;', output: 'x = a ? b ? c ? d : e : f : g;' },
             { input: 'x=a?b?c?d:{e1:1,e2:2}:f:g;', output: 'x = a ? b ? c ? d : {\n    e1: 1,\n    e2: 2\n} : f : g;' },
-            { input: 'function void(void) {}' },
+            { unchanged: 'function void(void) {}' },
             { input: 'if(!a)foo();', output: 'if (!a) foo();' },
             { input: 'a=~a', output: 'a = ~a' },
             { input: 'a;/*comment*/b;', output: "a; /*comment*/\nb;" },
@@ -2733,15 +2733,15 @@ exports.test_data = {
             { input: 'for(;;++i)a', output: 'for (;; ++i) a' },
             { input: 'return(1)', output: 'return (1)' },
             { input: 'try{a();}catch(b){c();}finally{d();}', output: "try {\n    a();\n} catch (b) {\n    c();\n} finally {\n    d();\n}" },
-            { input: '(xx)()', comment: ' magic function call' },
-            { input: 'a[1]()', comment: 'another magic function call' },
+            { unchanged: '(xx)()', comment: ' magic function call' },
+            { unchanged: 'a[1]()', comment: 'another magic function call' },
             { input: 'if(a){b();}else if(c) foo();', output: "if (a) {\n    b();\n} else if (c) foo();" },
             { input: 'switch(x) {case 0: case 1: a(); break; default: break}', output: "switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}" },
             { input: 'switch(x){case -1:break;case !y:break;}', output: 'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}' },
-            { input: 'a !== b' },
+            { unchanged: 'a !== b' },
             { input: 'if (a) b(); else c();', output: "if (a) b();\nelse c();" },
-            { input: "// comment\n(function something() {})", comment: 'typical greasemonkey start' },
-            { input: "{\n\n    x();\n\n}", comment: 'duplicating newlines' },
+            { unchanged: "// comment\n(function something() {})", comment: 'typical greasemonkey start' },
+            { unchanged: "{\n\n    x();\n\n}", comment: 'duplicating newlines' },
             { unchanged: 'if (a in b) foo();' },
             { unchanged: 'if (a of b) foo();' },
             { unchanged: 'if (a of [1, 2, 3]) foo();' },
@@ -2749,7 +2749,7 @@ exports.test_data = {
                 input: 'if(X)if(Y)a();else b();else c();',
                 output: "if (X)\n    if (Y) a();\n    else b();\nelse c();"
             },
-            { input: 'if (foo) bar();\nelse break' },
+            { unchanged: 'if (foo) bar();\nelse break' },
             { unchanged: 'var a, b;' },
             { unchanged: 'var a = new function();' },
             { fragment: true, unchanged: 'new function' },
@@ -2757,7 +2757,7 @@ exports.test_data = {
             { input: '{a:1, b:2}', output: "{\n    a: 1,\n    b: 2\n}" },
             { input: 'a={1:[-1],2:[+1]}', output: 'a = {\n    1: [-1],\n    2: [+1]\n}' },
             { input: "var l = {\\'a\\':\\'1\\', \\'b\\':\\'2\\'}", output: "var l = {\n    \\'a\\': \\'1\\',\n    \\'b\\': \\'2\\'\n}" },
-            { input: 'if (template.user[n] in bk) foo();' },
+            { unchanged: 'if (template.user[n] in bk) foo();' },
             { unchanged: 'return 45' },
             { unchanged: 'return this.prevObject ||\n\n    this.constructor(null);' },
             { unchanged: 'If[1]' },
@@ -2783,7 +2783,7 @@ exports.test_data = {
 
             {
                 comment: 'was: extra space appended',
-                input: "if (a) {\n    do();\n}"
+                unchanged: "if (a) {\n    do();\n}"
             },
 
             {
@@ -2879,7 +2879,7 @@ exports.test_data = {
             { fragment: true, unchanged: "#" },
             { fragment: true, unchanged: "#!" },
 
-            { input: "function namespace::something()" },
+            { unchanged: "function namespace::something()" },
 
             { fragment: true, unchanged: "<!--\nsomething();\n-->" },
             { fragment: true, input: "<!--\nif(i<0){bla();}\n-->", output: "<!--\nif (i < 0) {\n    bla();\n}\n-->" },
diff --git a/test/generate-tests.js b/test/generate-tests.js
index b77dc7125..2d0016211 100644
--- a/test/generate-tests.js
+++ b/test/generate-tests.js
@@ -85,13 +85,11 @@ function isStringOrArray(val) {
 }
 
 function getTestString(val) {
-    if (typeof val === 'string') {
-        return "'" + val.replace(/\n/g, '\\n').replace(/\t/g, '\\t') + "'";
-    } else if (val instanceof Array) {
-        return "'" + val.join("\\n' +\n            '").replace(/\t/g, '\\t') + "'";
-    } else {
-        return null;
-    }
+    val = val.split('\n');
+
+    var result = "'" + val.join("\\n' +\n            '").replace(/\t/g, '\\t') + "'";
+    result = result.replace(/' \+\n            ''$/, "'");
+    return result;
 }
 
 function set_formatters(data, test_method, comment_mark) {
@@ -108,7 +106,7 @@ function set_formatters(data, test_method, comment_mark) {
                 }
 
                 if (context.hasOwnProperty(name)) {
-                    outputs.push(name + ' = "' + context[name] + '"');
+                    outputs.push(name + ' = "' + context[name].replace(/\n/g, '\\n').replace(/\t/g, '\\t') + '"');
                 }
             }
             return render(outputs.join(', '));
@@ -117,76 +115,77 @@ function set_formatters(data, test_method, comment_mark) {
 
     data.test_line = function() {
         return function(text, render) {
-            var method_text = test_method;
-            if (this.fragment) {
-                method_text = 'test_fragment';
-            }
+            var method_text = this.fragment ? 'test_fragment' : test_method;
+            var comment = '';
+            var before_input = method_text + '(';
+            var input = null;
+            var before_output = ', ';
+            var output = null;
 
             // text is ignored for this.
-            var comment = '';
             if (typeof this.comment === 'string') {
-                comment = '\n        ' + comment_mark + this.comment + '\n        ';
-            } else if (this.comment instanceof Array) {
-                comment = '\n        ' + comment_mark + this.comment.join('\n        ' + comment_mark) + '\n        ';
+                this.comment = this.comment.split('\n');
             }
 
-            var input = null;
-            var before_input = method_text + '(';
-            var before_output = ', ';
+            if (this.comment instanceof Array) {
+                comment = '\n        ' + comment_mark + this.comment.join('\n        ' + comment_mark) + '\n        ';
+            }
 
-            function set_input(field, opt_newline) {
-                if (input !== null && isStringOrArray(field)) {
-                    throw "Only one test input field allowed (input, input_, or unchanged): " + input;
-                }
+            // input: the default field
+            // input_: allow underscore for formatting alignment with "output"
+            // unchanged: use "unchanged" instead of "input" if there is no output
+            input = this.input || this.input_ || this.unchanged;
+            if (input instanceof Array) {
+                input = input.join('\n');
+            }
 
-                if (typeof field === 'string' && !opt_newline) {
-                    input = getTestString(field);
-                } else if (field instanceof Array || (typeof field === 'string' && opt_newline)) {
-                    before_input = method_text + '(\n            ';
-                    before_output = ',\n            ';
-                    input = getTestString(field);
+            if (isStringOrArray(this.output)) {
+                output = this.output;
+                if (output instanceof Array) {
+                    output = output.join('\n');
                 }
             }
 
-            set_input(this.input);
-
-            // allow underscore for formatting alignment with "output"
-            set_input(this.input_, true);
-
-            // use "unchanged" instead of "input" if there is no output
-            set_input(this.unchanged);
-            if (isStringOrArray(this.unchanged) && isStringOrArray(this.output)) {
+            // Do all most error checking
+            if (!(this.input !== null || this.input_ !== null || this.unchanged !== null)) {
+                throw "Missing test input field (input, input_, or unchanged).";
+            } else if ((this.input !== null && (this.input_ !== null || this.unchanged !== null)) &&
+                (this.input_ === null || this.unchanged === null)) {
+                throw "Only one test input field allowed (input, input_, or unchanged): " + input;
+            } else if (output && isStringOrArray(this.unchanged)) {
                 throw "Cannot specify 'output' with 'unchanged' test input: " + input;
+            } else if (!output && !isStringOrArray(this.unchanged)) {
+                throw "Neither 'output' nor 'unchanged' specified for test input: " + input;
+            } else if (input === output) {
+                // Raw input and output can be the same, just omit output.
+                throw "Test strings are identical.  Omit 'output' and use 'unchanged': " + input;
             }
 
-            if (input === null) {
-                throw "Missing test input field (input, input_, or unchanged).";
+            if (output && output.indexOf('<%') !== -1) {
+                mustache.tags = ['<%', '%>'];
             }
 
-            var output = null;
-            if (typeof this.output === 'string') {
-                output = getTestString(this.output);
-            } else if (this.output instanceof Array) {
-                before_input = method_text + '(\n            ';
-                before_output = ',\n            ';
-                output = getTestString(this.output);
+            input = getTestString(render(input));
+
+            if (output) {
+                output = getTestString(render(output));
             } else {
-                before_output = '';
+                output = '';
             }
 
-            if (input === output) {
-                throw "Test strings are identical.  Omit 'output' and use 'unchanged': " + input;
+            if (output && output.indexOf('<%') !== -1) {
+                mustache.tags = ['{{', '}}'];
             }
 
-            if (output && output.indexOf('<%') !== -1) {
-                mustache.tags = ['<%', '%>'];
+            if (this.input_ || input.indexOf('\n') !== -1 || output.indexOf('\n') !== -1) {
+                before_input = method_text + '(\n            ';
+                before_output = ',\n            ' + comment_mark + ' -- output --\n            ';
             }
-            input = render(input);
-            output = render(output);
-            if (output && output.indexOf('<%') !== -1) {
-                mustache.tags = ['{{', '}}'];
+            if (output === '') {
+                before_output = '';
             }
 
+            // Rendered input and output can be the same, just omit output.
             if (output === input) {
                 before_output = '';
                 output = '';