diff --git a/test/helper.rb b/test/helper.rb
index c7fe6264..30bbe9f2 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -10,11 +10,11 @@ include Jekyll
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit
 
-  def dest_dir(subdirs = [])
+  def dest_dir(*subdirs)
     File.join(File.dirname(__FILE__), 'dest', *subdirs)
   end
 
-  def source_dir(subdirs = [])
+  def source_dir(*subdirs)
     File.join(File.dirname(__FILE__), 'source', *subdirs)
   end
 
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index da4b26b8..ae8ba531 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -18,7 +18,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "render post.content" do
-      latest_post = Dir[source_dir('_posts/*')].last
+      latest_post = Dir[source_dir('_posts', '*')].last
       post = Post.new(@site, source_dir, '', File.basename(latest_post))
       post.transform
       assert @index.include?(post.content)
diff --git a/test/test_site.rb b/test/test_site.rb
index e568e51f..e8d0ebb1 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -9,28 +9,28 @@ class TestSite < Test::Unit::TestCase
       @site = Site.new(Jekyll.configuration)
     end
 
-    #should "read layouts" do
-      #@s.read_layouts
-      #assert_equal ["default", "simple"].sort, @s.layouts.keys.sort
-    #end
+    should "read layouts" do
+      @site.read_layouts
+      assert_equal ["default", "simple"].sort, @site.layouts.keys.sort
+    end
 
-    #should "read posts" do
-      #@s.read_posts('')
-      #posts = Dir[File.join(@source, '_posts/*')]
-      #assert_equal posts.size - 1, @s.posts.size
-    #end
+    should "read posts" do
+      @site.read_posts('')
+      posts = Dir[source_dir('_posts', '*')]
+      assert_equal posts.size - 1, @site.posts.size
+    end
 
-    #should "deploy payload" do
-      #clear_dest
-      #@s.process
+    should "deploy payload" do
+      clear_dest
+      @site.process
 
-      #posts = Dir[File.join(@source, "**", "_posts/*")]
-      #categories = %w(bar baz category foo z_category publish_test).sort
+      posts = Dir[source_dir("**", "_posts", "*")]
+      categories = %w(bar baz category foo z_category publish_test).sort
 
-      #assert_equal posts.size - 1, @s.posts.size
-      #assert_equal categories, @s.categories.keys.sort
-      #assert_equal 3, @s.categories['foo'].size
-    #end
+      assert_equal posts.size - 1, @site.posts.size
+      assert_equal categories, @site.categories.keys.sort
+      assert_equal 4, @site.categories['foo'].size
+    end
 
     should "filter entries" do
       ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown#