diff --git a/Rakefile b/Rakefile
index 39fea06..eee70c8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,8 +3,9 @@ require 'rake/testtask'
 task :default => :test
 
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  Dir.glob("examples/*.html") do |file|
+    test = File.basename(file, ".html")
+    cmd = "ruby test/mustache_test.rb #{test}"
+    print `#{cmd}`
+  end
 end
-
diff --git a/examples/comments.txt b/examples/comments.txt
index 071e026..78f4384 100644
--- a/examples/comments.txt
+++ b/examples/comments.txt
@@ -1 +1,2 @@
 <h1>A Comedy of Errors{{! just something interesting... or not... }}</h1>
+
diff --git a/examples/complex.js b/examples/complex.js
index 1b4bf9e..a0dfb63 100644
--- a/examples/complex.js
+++ b/examples/complex.js
@@ -8,18 +8,12 @@ var complex = {
       {name: "blue", current: false, url: "#Blue"}
   ],
   link: function() {
-    var v = this["current"] === true;
-    // print("link() returns " + v);
-    return v;
+    return this["current"] !== true;
   },
   list: function() {
-    var v = this.item.length !== 0;
-    // print("list() returns " + v);
-    return v;
+    return this.item.length !== 0;
   },
   empty: function() {
-    var v = this.item.length === 0;
-    // print("empty() returns " + v);
-    return v;
+    return this.item.length === 0;
   }
 };
diff --git a/examples/complex.txt b/examples/complex.txt
index 05bc23d..52e4cce 100644
--- a/examples/complex.txt
+++ b/examples/complex.txt
@@ -1 +1,7 @@
-<h1>Colors</h1> <ul>   <li><strong>red</strong></li>    <li><a href="#Green">green</a></li>    <li><a href="#Blue">blue</a></li>    </ul>
\ No newline at end of file
+<h1>Colors</h1>
+<ul>
+  <li><strong>red</strong></li>
+    <li><a href="#Green">green</a></li>
+    <li><a href="#Blue">blue</a></li>
+    </ul>
+
diff --git a/examples/escaped.js b/examples/escaped.js
new file mode 100644
index 0000000..fd8ab37
--- /dev/null
+++ b/examples/escaped.js
@@ -0,0 +1,5 @@
+var escaped = {
+  title: function() {
+    return "Bear > Shark";
+  }
+};
diff --git a/examples/escaped.txt b/examples/escaped.txt
new file mode 100644
index 0000000..7f4de76
--- /dev/null
+++ b/examples/escaped.txt
@@ -0,0 +1 @@
+<h1>Bear &gt; Shark</h1>
diff --git a/examples/simple.txt b/examples/simple.txt
index 5d75d65..f7ef812 100644
--- a/examples/simple.txt
+++ b/examples/simple.txt
@@ -1,3 +1,4 @@
 Hello Chris
 You have just won $10000!
 Well, $6000, after taxes.
+
diff --git a/examples/unescaped.js b/examples/unescaped.js
new file mode 100644
index 0000000..0bd20b8
--- /dev/null
+++ b/examples/unescaped.js
@@ -0,0 +1,5 @@
+var unescaped = {
+  title: function() {
+    return "Bear > Shark";
+  }
+};
diff --git a/examples/unescaped.txt b/examples/unescaped.txt
new file mode 100644
index 0000000..089ad79
--- /dev/null
+++ b/examples/unescaped.txt
@@ -0,0 +1 @@
+<h1>Bear > Shark</h1>