diff --git a/test/examples/lotr.git/logs/HEAD b/test/examples/lotr.git/logs/HEAD
index 3259d5f7..6290f7a5 100644
--- a/test/examples/lotr.git/logs/HEAD
+++ b/test/examples/lotr.git/logs/HEAD
@@ -6,3 +6,4 @@ b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5
 b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley <daz.oakley@gmail.com> 1341830099 +0100	push
 cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley <daz.oakley@gmail.com> 1341830833 +0100	push
 629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey <dekimsey@ufl.edu> 1352501984 -0500	push
+7d6aeab8b84c895f21f6c66b84a457b0fced9693 563cc3701db990caf63e4ce9c3697a062890ca48 James Dabbs <jamesdabbs@gmail.com> 1361843315 -0500	push
diff --git a/test/examples/lotr.git/logs/refs/heads/master b/test/examples/lotr.git/logs/refs/heads/master
index 3259d5f7..6290f7a5 100644
--- a/test/examples/lotr.git/logs/refs/heads/master
+++ b/test/examples/lotr.git/logs/refs/heads/master
@@ -6,3 +6,4 @@ b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5
 b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley <daz.oakley@gmail.com> 1341830099 +0100	push
 cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley <daz.oakley@gmail.com> 1341830833 +0100	push
 629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey <dekimsey@ufl.edu> 1352501984 -0500	push
+7d6aeab8b84c895f21f6c66b84a457b0fced9693 563cc3701db990caf63e4ce9c3697a062890ca48 James Dabbs <jamesdabbs@gmail.com> 1361843315 -0500	push
diff --git a/test/examples/lotr.git/objects/56/3cc3701db990caf63e4ce9c3697a062890ca48 b/test/examples/lotr.git/objects/56/3cc3701db990caf63e4ce9c3697a062890ca48
new file mode 100644
index 00000000..d3c21036
Binary files /dev/null and b/test/examples/lotr.git/objects/56/3cc3701db990caf63e4ce9c3697a062890ca48 differ
diff --git a/test/examples/lotr.git/objects/7a/cc5626e5ab453dd82857bb1843793ea058fa2c b/test/examples/lotr.git/objects/7a/cc5626e5ab453dd82857bb1843793ea058fa2c
new file mode 100644
index 00000000..45ccf1d0
Binary files /dev/null and b/test/examples/lotr.git/objects/7a/cc5626e5ab453dd82857bb1843793ea058fa2c differ
diff --git a/test/examples/lotr.git/objects/99/49601deb167a35ca444311d7372864f3e8e1b8 b/test/examples/lotr.git/objects/99/49601deb167a35ca444311d7372864f3e8e1b8
new file mode 100644
index 00000000..ad47cd48
Binary files /dev/null and b/test/examples/lotr.git/objects/99/49601deb167a35ca444311d7372864f3e8e1b8 differ
diff --git a/test/examples/lotr.git/refs/heads/master b/test/examples/lotr.git/refs/heads/master
index f01a5091..546030a2 100644
--- a/test/examples/lotr.git/refs/heads/master
+++ b/test/examples/lotr.git/refs/heads/master
@@ -1 +1 @@
-7d6aeab8b84c895f21f6c66b84a457b0fced9693
+563cc3701db990caf63e4ce9c3697a062890ca48
diff --git a/test/test_committer.rb b/test/test_committer.rb
index e9b2e17b..15b11231 100644
--- a/test/test_committer.rb
+++ b/test/test_committer.rb
@@ -50,7 +50,7 @@ context "Wiki" do
   end
 
   test "parents with default master ref" do
-    ref = '7d6aeab8b84c895f21f6c66b84a457b0fced9693'
+    ref = '563cc3701db990caf63e4ce9c3697a062890ca48'
     committer = Gollum::Committer.new(@wiki)
     assert_equal ref,  committer.parents.first.sha
   end
diff --git a/test/test_git_access.rb b/test/test_git_access.rb
index caaa37d5..6e62e663 100644
--- a/test/test_git_access.rb
+++ b/test/test_git_access.rb
@@ -18,7 +18,7 @@ context "GitAccess" do
     assert @access.ref_map.empty?
     assert @access.tree_map.empty?
     @access.tree 'master'
-    assert_equal({"master"=>"7d6aeab8b84c895f21f6c66b84a457b0fced9693"}, @access.ref_map)
+    assert_equal({"master"=>"563cc3701db990caf63e4ce9c3697a062890ca48"}, @access.ref_map)
 
     @access.tree '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'
     map = @access.tree_map['1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3']
diff --git a/test/test_page.rb b/test/test_page.rb
index fc1c34a4..a2cd4c6c 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -236,4 +236,18 @@ if $METADATA
   end
 end
 
+end
+
+context "with custom markup engines" do
+  setup do
+    Gollum::Markup.register(:redacted, "Redacted", :regexp => /rd/) { |content| content.gsub /\S/, '-' }
+    @wiki = Gollum::Wiki.new(testpath("examples/lotr.git"))
+  end
+
+  test "should use the specified engine" do
+    page = @wiki.page('Riddles')
+    assert_equal :redacted, page.format
+    assert page.raw_data.include? 'Time'
+    assert page.raw_data =~ /^[\s\-]*$/
+  end
 end
\ No newline at end of file
diff --git a/test/test_wiki.rb b/test/test_wiki.rb
index 531c1200..af51ab06 100644
--- a/test/test_wiki.rb
+++ b/test/test_wiki.rb
@@ -61,7 +61,7 @@ context "Wiki" do
   test "list files" do
     files = @wiki.files
     assert_equal \
-      ['Data.csv', 'eye.jpg', 'todo.txt'],
+      ['Data.csv', 'Riddles.rd', 'eye.jpg', 'todo.txt'],
       files.map { |p| p.filename }.sort
   end