diff --git a/spec/eventv0.rb b/spec/event.rb
similarity index 66%
rename from spec/eventv0.rb
rename to spec/event.rb
index 3ecd93896..465f1837f 100644
--- a/spec/eventv0.rb
+++ b/spec/event.rb
@@ -3,26 +3,26 @@ require "insist"
 
 describe LogStash::Event do
   subject do
-    event = LogStash::Event.new
-    event.timestamp = Time.at(1356998400) #"2013-01-01T00:00:00.000Z"
-    event.type = "sprintf"
-    event.message = "hello world"
-    event.tags = [ "tag1" ]
-    event.source = "/home/foo"
-    event.to_hash.merge!(
+    LogStash::Event.new(
+      "@timestamp" => Time.iso8601("2013-01-01T00:00:00.000Z"),
+      "type" => "sprintf",
+      "message" => "hello world",
+      "tags" => [ "tag1" ],
+      "source" => "/home/foo",
       "a" => "b", 
-      "c" => { "d" => "f", "e.f" => "g" }, 
-      "c.d" => "e",
-      "f.g" => { "h" => "i" },
+      "c" => {
+        "d" => "f",
+        "e" => {"f" => "g"}
+      }, 
+      "f" => { "g" => { "h" => "i" } },
       "j" => { 
-        "k1" => "v", 
-        "k2" => [ "w", "x" ],
-        "k3.4" => "m",
-        5 => 6,
-        "5" => 7
+          "k1" => "v", 
+          "k2" => [ "w", "x" ],
+          "k3" => {"4" => "m"},
+          5 => 6,
+          "5" => 7
       } 
     )
-    next event
   end
 
   context "#sprintf" do
@@ -53,19 +53,24 @@ describe LogStash::Event do
     end
     it "should fetch fields" do
       insist { subject["a"] } == "b"
-      insist { subject["c.d"] } == "e"
+      insist { subject['c']['d'] } == "f"
     end
     it "should fetch deep fields" do
       insist { subject["[j][k1]"] } == "v"
       insist { subject["[c][d]"] } == "f"
-      insist { subject["[f.g][h]"] } == "i"
-      insist { subject["[j][k3.4]"] } == "m"
-      insist { subject["[j][5]"] } == 7
+      insist { subject['[f][g][h]'] } == "i"
+      insist { subject['[j][k3][4]'] } == "m"
+      insist { subject['[j][5]'] } == 7
 
     end
   end
 
   context "#append" do
+    it "should append strings to an array" do
+      subject.append(LogStash::Event.new("message" => "another thing"))
+      insist { subject["message"] } == [ "hello world", "another thing" ]
+    end
+  
     it "should concatenate tags" do
       subject.append(LogStash::Event.new("tags" => [ "tag2" ]))
       insist { subject["tags"] } == [ "tag1", "tag2" ]
@@ -73,11 +78,11 @@ describe LogStash::Event do
   
     context "when event field is nil" do
       it "should add single value as string" do
-        subject.append(LogStash::Event.new("field1" => "append1"))
+        subject.append(LogStash::Event.new({"field1" => "append1"}))
         insist { subject[ "field1" ] } == "append1"
       end
       it "should add multi values as array" do
-        subject.append(LogStash::Event.new("field1" => [ "append1","append2" ]))
+        subject.append(LogStash::Event.new({"field1" => [ "append1","append2" ]}))
         insist { subject[ "field1" ] } == [ "append1","append2" ]
       end
     end
@@ -86,19 +91,19 @@ describe LogStash::Event do
       before { subject[ "field1" ] = "original1" }
   
       it "should append string to values, if different from current" do
-        subject.append(LogStash::Event.new("field1" => "append1"))
+        subject.append(LogStash::Event.new({"field1" => "append1"}))
         insist { subject[ "field1" ] } == [ "original1", "append1" ]
       end
       it "should not change value, if appended value is equal current" do
-        subject.append(LogStash::Event.new("field1" => "original1"))
+        subject.append(LogStash::Event.new({"field1" => "original1"}))
         insist { subject[ "field1" ] } == "original1"
       end
       it "should concatenate values in an array" do
-        subject.append(LogStash::Event.new("field1" => [ "append1" ]))
+        subject.append(LogStash::Event.new({"field1" => [ "append1" ]}))
         insist { subject[ "field1" ] } == [ "original1", "append1" ]
       end
       it "should join array, removing duplicates" do
-        subject.append(LogStash::Event.new("field1" => [ "append1","original1" ]))
+        subject.append(LogStash::Event.new({"field1" => [ "append1","original1" ]}))
         insist { subject[ "field1" ] } == [ "original1", "append1" ]
       end
     end
@@ -106,15 +111,15 @@ describe LogStash::Event do
       before { subject[ "field1" ] = [ "original1", "original2" ] }
   
       it "should append string values to array, if not present in array" do
-        subject.append(LogStash::Event.new("field1" => "append1"))
+        subject.append(LogStash::Event.new({"field1" => "append1"}))
         insist { subject[ "field1" ] } == [ "original1", "original2", "append1" ]
       end
       it "should not append string values, if the array already contains it" do
-        subject.append(LogStash::Event.new("field1" => "original1"))
+        subject.append(LogStash::Event.new({"field1" => "original1"}))
         insist { subject[ "field1" ] } == [ "original1", "original2" ]
       end
       it "should join array, removing duplicates" do
-        subject.append(LogStash::Event.new("field1" => [ "append1","original1" ]))
+        subject.append(LogStash::Event.new({"field1" => [ "append1","original1" ]}))
         insist { subject[ "field1" ] } == [ "original1", "original2", "append1" ]
       end
     end
diff --git a/spec/eventv1.rb b/spec/eventv1.rb
deleted file mode 100644
index f0c5d295f..000000000
--- a/spec/eventv1.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-require "logstash/event"
-require "insist"
-
-describe LogStash::Event do
-  before :each do
-    @event = LogStash::Event.new({ 
-        "a" => "b", 
-        "c" => {
-            "d" => "f",
-            "e" => {"f" => "g"}
-        }, 
-        "f" => {"g" => { 
-                "h" => "i" 
-            }
-        },
-        "j" => { 
-            "k1" => "v", 
-            "k2" => [
-                "w", 
-                "x" 
-            ],
-            "k3" => {"4" => "m"},
-            5 => 6,
-            "5" => 7
-        } 
-    })
-    @event.timestamp = "2013-01-01T00:00:00.000Z"
-    @event["type"] = "sprintf"
-    @event["message"] = "hello world"
-    @event["tags"] = [ "tag1" ]
-    @event["source"] = "/home/foo"
-  end
-
-  subject { @event }
-
-  context "#sprintf" do
-    it "should report a unix timestamp for %{+%s}" do
-      insist { @event.sprintf("%{+%s}") } == "1356998400"
-    end
-    
-    it "should report a time with %{+format} syntax" do
-      insist { @event.sprintf("%{+YYYY}") } == "2013"
-      insist { @event.sprintf("%{+MM}") } == "01"
-      insist { @event.sprintf("%{+HH}") } == "00"
-    end
-  
-    it "should report fields with %{field} syntax" do
-      insist { @event.sprintf("%{type}") } == "sprintf"
-      insist { @event.sprintf("%{message}") } == subject["message"]
-    end
-    
-    it "should print deep fields" do
-      insist { @event.sprintf("%{[j][k1]}") } == "v"
-      insist { @event.sprintf("%{[j][k2][0]}") } == "w"
-    end
-  end
-  
-  context "#[]" do
-    it "should fetch data" do
-      insist { @event["type"] } == "sprintf"
-    end
-    it "should fetch fields" do
-      insist { @event["a"] } == "b"
-      insist { @event['c']['d'] } == "f"
-    end
-    it "should fetch deep fields" do
-      insist { @event["[j][k1]"] } == "v"
-      insist { @event["[c][d]"] } == "f"
-      insist { @event['[f][g][h]'] } == "i"
-      insist { @event['[j][k3][4]'] } == "m"
-      insist { @event['[j][5]'] } == 7
-
-    end
-  end
-
-  context "#append" do
-    it "should append message with \\n" do
-      subject.append(LogStash::Event.new("message" => "hello world"))
-      insist { subject["message"] } == "hello world\nhello world"
-    end
-  
-    it "should concatenate tags" do
-      subject.append(LogStash::Event.new("tags" => [ "tag2" ]))
-      insist { subject["tags"] } == [ "tag1", "tag2" ]
-    end
-  
-    context "when event field is nil" do
-      it "should add single value as string" do
-        subject.append(LogStash::Event.new({"field1" => "append1"}))
-        insist { subject[ "field1" ] } == "append1"
-      end
-      it "should add multi values as array" do
-        subject.append(LogStash::Event.new({"field1" => [ "append1","append2" ]}))
-        insist { subject[ "field1" ] } == [ "append1","append2" ]
-      end
-    end
-  
-    context "when event field is a string" do
-      before { subject[ "field1" ] = "original1" }
-  
-      it "should append string to values, if different from current" do
-        subject.append(LogStash::Event.new({"field1" => "append1"}))
-        insist { subject[ "field1" ] } == [ "original1", "append1" ]
-      end
-      it "should not change value, if appended value is equal current" do
-        subject.append(LogStash::Event.new({"field1" => "original1"}))
-        insist { subject[ "field1" ] } == [ "original1" ]
-      end
-      it "should concatenate values in an array" do
-        subject.append(LogStash::Event.new({"field1" => [ "append1" ]}))
-        insist { subject[ "field1" ] } == [ "original1", "append1" ]
-      end
-      it "should join array, removing duplicates" do
-        subject.append(LogStash::Event.new({"field1" => [ "append1","original1" ]}))
-        insist { subject[ "field1" ] } == [ "original1", "append1" ]
-      end
-    end
-    context "when event field is an array" do
-      before { subject[ "field1" ] = [ "original1", "original2" ] }
-  
-      it "should append string values to array, if not present in array" do
-        subject.append(LogStash::Event.new({"field1" => "append1"}))
-        insist { subject[ "field1" ] } == [ "original1", "original2", "append1" ]
-      end
-      it "should not append string values, if the array already contains it" do
-        subject.append(LogStash::Event.new({"field1" => "original1"}))
-        insist { subject[ "field1" ] } == [ "original1", "original2" ]
-      end
-      it "should join array, removing duplicates" do
-        subject.append(LogStash::Event.new({"field1" => [ "append1","original1" ]}))
-        insist { subject[ "field1" ] } == [ "original1", "original2", "append1" ]
-      end
-    end
-  end
-end