diff --git a/lib/grit/grit.rb b/lib/grit/grit.rb
index 01bc4c5a..c6fb134b 100644
--- a/lib/grit/grit.rb
+++ b/lib/grit/grit.rb
@@ -34,7 +34,7 @@ def description
   # Returns Grit::Head[]
   def heads
     output = git("for-each-ref",
-                 "--count=1",
+                 # "--count=1",
                  "--sort=-committerdate",
                  "--format='%(objectname) %(refname) %(subject)%00%(committer)'",
                  "refs/heads")
diff --git a/test/helper.rb b/test/helper.rb
index 56e21da6..6b82ba54 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,5 +1,7 @@
 require File.join(File.dirname(__FILE__), *%w[.. lib grit])
 
+require 'rubygems'
 require 'test/unit'
+require 'mocha'
 
 GRIT_REPO = File.join(File.dirname(__FILE__), *%w[..])
diff --git a/test/test_grit.rb b/test/test_grit.rb
index 1af51bfe..af43a344 100644
--- a/test/test_grit.rb
+++ b/test/test_grit.rb
@@ -10,9 +10,13 @@ def test_description
   end
   
   def test_heads
+    @g.expects(:git).returns("634396b2f541a9f2d58b00be1a07f0c358b999b3 refs/heads/master \
+    initial grit setup\0Tom Preston-Werner <tom@mojombo.com> 1191997100 -0700")
+    
     heads = @g.heads
     head = heads.first
     assert_equal Grit::Head, head.class
+    
     assert_equal '634396b2f541a9f2d58b00be1a07f0c358b999b3', head.id
     assert_equal 'refs/heads/master', head.name
     assert_equal 'initial grit setup', head.message