diff --git a/spec/lib/onebox/engine_spec.rb b/spec/lib/onebox/engine_spec.rb
index 2866ea19..8bf5ab11 100644
--- a/spec/lib/onebox/engine_spec.rb
+++ b/spec/lib/onebox/engine_spec.rb
@@ -1,53 +1,77 @@
 require "spec_helper"
 
-class Onebox::Engine::Foo
+class OneboxEngineExample
   include Onebox::Engine
 
-  def record
-    "foo"
+  def data
+    { foo: raw[:key], url: @url }
+  end
+
+  def raw
+    { key: "value" }
+  end
+
+  def template
+    %|<div class="onebox"><a href="{{url}}"></a></div>|
   end
 end
 
 describe Onebox::Engine do
   describe "#to_html" do
-    it "returns formatted html"
+    it "returns the onebox wrapper" do
+      html = OneboxEngineExample.new("foo").to_html
+      expect(html).to include(%|class="onebox"|)
+    end
+
+    it "doesn't allow XSS injection" do
+      html = OneboxEngineExample.new(%|http://foo.com" onscript="alert('foo')|).to_html
+      expect(html).not_to include(%|onscript="alert('foo')|)
+    end
   end
 
   describe "#record" do
-    it "returns cache value for given url if cache exists" do
-      cache = { "http://example.com" => "foo" }
-      result = Onebox::Engine::Foo.new("http://example.com", cache).send(:record)
-      expect(result).to eq("foo")
+    class OneboxEngineBar
+      include Onebox::Engine
+
+      def data
+        "new content"
+      end
+    end
+
+    it "returns cached value for given url if its url is already in cache" do
+      cache = { "http://example.com" => "old content" }
+      result = OneboxEngineBar.new("http://example.com", cache).send(:record)
+      expect(result).to eq("old content")
     end
 
     it "stores cache value for given url if cache key doesn't exist" do
-      cache = { "http://example.com1" => "foo" }
-      result = Onebox::Engine::Foo.new("http://example.com").send(:record)
-      expect(result).to eq("foo")
+      cache = { "http://example.com1" => "old content" }
+      result = OneboxEngineBar.new("http://example.com", cache).send(:record)
+      expect(result).to eq("new content")
     end
   end
 
   describe ".===" do
     it "returns true if argument matches the matcher" do
-      class Onebox::Engine::Foo
+      class OneboxEngineFoo
         include Onebox::Engine
         @@matcher = /example/
       end
-      result = Onebox::Engine::Foo === "http://www.example.com/product/5?var=foo&bar=5"
+      result = OneboxEngineFoo === "http://www.example.com/product/5?var=foo&bar=5"
       expect(result).to eq(true)
     end
   end
 
   describe ".matches" do
     it "sets @@matcher to a regular expression" do
-      class Onebox::Engine::Far
+      class OneboxEngineFar
         include Onebox::Engine
 
         matches do
           find "foo.com"
         end
       end
-      regex = Onebox::Engine::Far.class_variable_get(:@@matcher)
+      regex = OneboxEngineFar.class_variable_get(:@@matcher)
       expect(regex).to eq(/(?:foo\.com)/i)
     end
   end
diff --git a/spec/lib/onebox_spec.rb b/spec/lib/onebox_spec.rb
index ad4feb6c..23d5fa82 100644
--- a/spec/lib/onebox_spec.rb
+++ b/spec/lib/onebox_spec.rb
@@ -23,6 +23,27 @@
       cache = preview.cache
       expect(cache.fetch(url)).to be(nil)
     end
+  end
+
+  describe "templates" do
+    let(:templates) { Dir["templates/*.handlebars"] }
 
+    def expect_templates_to_not_match(text)
+      templates.each do |template|
+        expect(File.read(template)).not_to match(text)
+      end
+    end
+
+    it "should not contain any triple braces" do
+      expect_templates_to_not_match(/\{\{\{/)
+    end
+
+    it "should not contain any script tags" do
+      expect_templates_to_not_match(/<script/)
+    end
+
+    it "should not contain any on*" do
+      expect_templates_to_not_match(/\s*on.+\s*=/)
+    end
   end
 end
diff --git a/templates/wikipedia.handlebars b/templates/wikipedia.handlebars
index 601a4289..be336896 100644
--- a/templates/wikipedia.handlebars
+++ b/templates/wikipedia.handlebars
@@ -3,6 +3,6 @@
     <h1>{{name}}</h1>
     <h2 class="host">wikipedia.org</h2>
     <img src="{{image}}" />
-    <p>{{{description}}}</p>
+    <p>{{description}}</p>
   </a>
 </div>