diff --git a/examples/array_of_partials_implicit_partial.2.html b/examples/array_of_partials_implicit_partial.2.html
index 91012a6..12f7159 100644
--- a/examples/array_of_partials_implicit_partial.2.html
+++ b/examples/array_of_partials_implicit_partial.2.html
@@ -1 +1 @@
-{{.}}
\ No newline at end of file
+{{.}}
diff --git a/examples/array_of_partials_implicit_partial.html b/examples/array_of_partials_implicit_partial.html
index 0fba4c5..11537e9 100644
--- a/examples/array_of_partials_implicit_partial.html
+++ b/examples/array_of_partials_implicit_partial.html
@@ -1,3 +1,5 @@
 Here is some stuff!
 {{%IMPLICIT-ITERATOR}}
-{{#numbers}}{{>partial}}{{/numbers}}
+{{#numbers}}
+{{>partial}}
+{{/numbers}}
diff --git a/examples/array_of_partials_implicit_partial.txt b/examples/array_of_partials_implicit_partial.txt
index 5578617..f622375 100644
--- a/examples/array_of_partials_implicit_partial.txt
+++ b/examples/array_of_partials_implicit_partial.txt
@@ -1,5 +1,4 @@
 Here is some stuff!
-
 1
 2
 3
diff --git a/examples/array_of_partials_partial.2.html b/examples/array_of_partials_partial.2.html
index 6f890e1..bdde77d 100644
--- a/examples/array_of_partials_partial.2.html
+++ b/examples/array_of_partials_partial.2.html
@@ -1 +1 @@
-{{i}}
\ No newline at end of file
+{{i}}
diff --git a/examples/array_of_partials_partial.html b/examples/array_of_partials_partial.html
index ba5ae8f..1af6d68 100644
--- a/examples/array_of_partials_partial.html
+++ b/examples/array_of_partials_partial.html
@@ -1,3 +1,4 @@
 Here is some stuff!
-{{#numbers}}{{>partial}}
-{{/numbers}}
\ No newline at end of file
+{{#numbers}}
+{{>partial}}
+{{/numbers}}
diff --git a/examples/array_of_partials_partial.txt b/examples/array_of_partials_partial.txt
index 4107dcc..f622375 100644
--- a/examples/array_of_partials_partial.txt
+++ b/examples/array_of_partials_partial.txt
@@ -3,4 +3,3 @@ Here is some stuff!
 2
 3
 4
-
diff --git a/examples/array_of_strings.html b/examples/array_of_strings.html
index b466a3f..ab058c4 100644
--- a/examples/array_of_strings.html
+++ b/examples/array_of_strings.html
@@ -1 +1,2 @@
-{{%IMPLICIT-ITERATOR}}{{#array_of_strings}}{{.}} {{/array_of_strings}}
\ No newline at end of file
+{{%IMPLICIT-ITERATOR}}
+{{#array_of_strings}} {{.}} {{/array_of_strings}}
\ No newline at end of file
diff --git a/examples/array_of_strings.txt b/examples/array_of_strings.txt
index f63e6ab..4a1f475 100644
--- a/examples/array_of_strings.txt
+++ b/examples/array_of_strings.txt
@@ -1 +1 @@
-hello world 
\ No newline at end of file
+hello world 
diff --git a/examples/array_of_strings_options.html b/examples/array_of_strings_options.html
index eaf8248..87fbf5e 100644
--- a/examples/array_of_strings_options.html
+++ b/examples/array_of_strings_options.html
@@ -1 +1,2 @@
-{{%IMPLICIT-ITERATOR iterator=rob}}{{#array_of_strings_options}}{{rob}} {{/array_of_strings_options}}
\ No newline at end of file
+{{%IMPLICIT-ITERATOR iterator=rob}}
+{{#array_of_strings_options}} {{rob}} {{/array_of_strings_options}}
\ No newline at end of file
diff --git a/examples/array_of_strings_options.txt b/examples/array_of_strings_options.txt
index f63e6ab..4a1f475 100644
--- a/examples/array_of_strings_options.txt
+++ b/examples/array_of_strings_options.txt
@@ -1 +1 @@
-hello world 
\ No newline at end of file
+hello world 
diff --git a/examples/complex.html b/examples/complex.html
index a3708b4..e7ca1b5 100644
--- a/examples/complex.html
+++ b/examples/complex.html
@@ -1,8 +1,16 @@
 <h1>{{header}}</h1>
 {{#list}}
-  <ul>{{#item}}
-    {{#current}}<li><strong>{{name}}</strong></li>{{/current}}
-    {{#link}}<li><a href="{{url}}">{{name}}</a></li>{{/link}}
-  {{/item}}</ul>
+  <ul>
+  {{#item}}
+    {{#current}}
+      <li><strong>{{name}}</strong></li>
+    {{/current}}
+    {{#link}}
+      <li><a href="{{url}}">{{name}}</a></li>
+    {{/link}}
+  {{/item}}
+  </ul>
 {{/list}}
-{{#empty}}<p>The list is empty.</p>{{/empty}}
\ No newline at end of file
+{{#empty}}
+  <p>The list is empty.</p>
+{{/empty}}
\ No newline at end of file
diff --git a/examples/complex.txt b/examples/complex.txt
index a5dd36b..eb78d45 100644
--- a/examples/complex.txt
+++ b/examples/complex.txt
@@ -1,13 +1,6 @@
 <h1>Colors</h1>
-
-  <ul>
-    <li><strong>red</strong></li>
-    
-  
-    
+<ul>
+  <li><strong>red</strong></li>
     <li><a href="#Green">green</a></li>
-  
-    
     <li><a href="#Blue">blue</a></li>
-  </ul>
-
+    </ul>
diff --git a/examples/delimiters.txt b/examples/delimiters.txt
index 084b64a..698a6bb 100644
--- a/examples/delimiters.txt
+++ b/examples/delimiters.txt
@@ -1,7 +1,5 @@
 *
 It worked the first time.
 * And it worked the second time.
-
 * Then, surprisingly, it worked the third time.
-
-* Fourth time also fine!.
\ No newline at end of file
+* Fourth time also fine!.
diff --git a/examples/empty_partial.html b/examples/empty_partial.html
index a5cbb99..a710047 100644
--- a/examples/empty_partial.html
+++ b/examples/empty_partial.html
@@ -1,2 +1,2 @@
 hey {{foo}}
-{{>partial}}
\ No newline at end of file
+{{>partial}}
diff --git a/examples/empty_template.txt b/examples/empty_template.txt
index bb2367a..60652b6 100644
--- a/examples/empty_template.txt
+++ b/examples/empty_template.txt
@@ -1 +1 @@
-<html><head></head><body><h1>Test</h1></body></html>
\ No newline at end of file
+<html><head></head><body><h1>Test</h1></body></html>
diff --git a/examples/error_not_found.txt b/examples/error_not_found.txt
index e69de29..8b13789 100644
--- a/examples/error_not_found.txt
+++ b/examples/error_not_found.txt
@@ -0,0 +1 @@
+
diff --git a/examples/inverted_section.txt b/examples/inverted_section.txt
index 06d5d66..5fd0de1 100644
--- a/examples/inverted_section.txt
+++ b/examples/inverted_section.txt
@@ -1,2 +1 @@
-
 No repos :(
diff --git a/examples/recursion_with_same_names.html b/examples/recursion_with_same_names.html
index d804f17..c331d04 100644
--- a/examples/recursion_with_same_names.html
+++ b/examples/recursion_with_same_names.html
@@ -2,6 +2,6 @@
 {{ description }}
 
 {{#terms}}
-{{name}}
+  {{name}}
   {{index}}
-{{/terms}}
\ No newline at end of file
+{{/terms}}
diff --git a/examples/recursion_with_same_names.txt b/examples/recursion_with_same_names.txt
index b9f3226..0f3e1bc 100644
--- a/examples/recursion_with_same_names.txt
+++ b/examples/recursion_with_same_names.txt
@@ -1,9 +1,6 @@
 name
 desc
-
-
 t1
   0
-
 t2
   1
diff --git a/examples/reuse_of_enumerables.html b/examples/reuse_of_enumerables.html
index ae4c805..cc0cb7a 100644
--- a/examples/reuse_of_enumerables.html
+++ b/examples/reuse_of_enumerables.html
@@ -1,8 +1,8 @@
 {{#terms}}
-{{name}}
+  {{name}}
   {{index}}
 {{/terms}}
 {{#terms}}
-{{name}}
+  {{name}}
   {{index}}
-{{/terms}}
\ No newline at end of file
+{{/terms}}
diff --git a/examples/reuse_of_enumerables.txt b/examples/reuse_of_enumerables.txt
index 8a9d183..c6d5170 100644
--- a/examples/reuse_of_enumerables.txt
+++ b/examples/reuse_of_enumerables.txt
@@ -1,13 +1,8 @@
-
 t1
   0
-
 t2
   1
-
-
 t1
   0
-
 t2
   1
diff --git a/examples/section_as_context.html b/examples/section_as_context.html
index 1bcf00d..6a39a43 100644
--- a/examples/section_as_context.html
+++ b/examples/section_as_context.html
@@ -1,8 +1,9 @@
 {{#a_object}}
-<h1>{{title}}</h1>
+  <h1>{{title}}</h1>
   <p>{{description}}</p>
   <ul>
-    {{#a_list}}<li>{{label}}</li>
+    {{#a_list}}
+      <li>{{label}}</li>
     {{/a_list}}
   </ul>
-{{/a_object}}
\ No newline at end of file
+{{/a_object}}
diff --git a/examples/section_as_context.txt b/examples/section_as_context.txt
index cf0c260..55d4179 100644
--- a/examples/section_as_context.txt
+++ b/examples/section_as_context.txt
@@ -1,8 +1,6 @@
-
 <h1>this is an object</h1>
   <p>one of its attributes is a list</p>
   <ul>
     <li>listitem1</li>
     <li>listitem2</li>
-    
-  </ul>
+    </ul>
diff --git a/examples/simple.txt b/examples/simple.txt
index e2943b9..5d75d65 100644
--- a/examples/simple.txt
+++ b/examples/simple.txt
@@ -1,4 +1,3 @@
 Hello Chris
 You have just won $10000!
-
 Well, $6000, after taxes.
diff --git a/examples/two_in_a_row.txt b/examples/two_in_a_row.txt
index 97f4a2f..c6d6a9b 100644
--- a/examples/two_in_a_row.txt
+++ b/examples/two_in_a_row.txt
@@ -1 +1 @@
-Welcome, Joe!
\ No newline at end of file
+Welcome, Joe!
diff --git a/examples/unescaped.txt b/examples/unescaped.txt
index 01fa404..089ad79 100644
--- a/examples/unescaped.txt
+++ b/examples/unescaped.txt
@@ -1 +1 @@
-<h1>Bear > Shark</h1>
\ No newline at end of file
+<h1>Bear > Shark</h1>
diff --git a/examples/unknown_pragma.txt b/examples/unknown_pragma.txt
index 3d5ab32..a34840d 100644
--- a/examples/unknown_pragma.txt
+++ b/examples/unknown_pragma.txt
@@ -1 +1 @@
-ERROR: This mustache implementation doesn't understand the 'I-HAVE-THE-GREATEST-MUSTACHE' pragma
\ No newline at end of file
+ERROR: This implementation of mustache doesn't understand the 'I-HAVE-THE-GREATEST-MUSTACHE' pragma
diff --git a/test/mustache_spec.rb b/test/mustache_spec.rb
index c04693d..9ede6c8 100644
--- a/test/mustache_spec.rb
+++ b/test/mustache_spec.rb
@@ -68,7 +68,7 @@ describe "mustache" do
           }
         JS
 
-        run_js(runner).should == expect + "\n"
+        run_js(runner).should == expect
       end
       it "should sendFun the correct html" do
 
@@ -86,7 +86,7 @@ describe "mustache" do
             }
             var template = #{template};
             Mustache.to_html(template, #{testname}, null, sendFun);
-            print(chunks.join(""));
+            print(chunks.join("\\n"));
           } catch(e) {
             print('ERROR: ' + e.message);
           }
@@ -137,7 +137,7 @@ describe "mustache" do
               }
             }
             Mustache.to_html(template, partial_context, partials, sendFun);
-            print(chunks.join(""));
+            print(chunks.join("\\n"));
           } catch(e) {
             print('ERROR: ' + e.message);
           }