diff --git a/apiclient/http.py b/apiclient/http.py
index 2b35c85..cecf3f2 100644
--- a/apiclient/http.py
+++ b/apiclient/http.py
@@ -157,12 +157,14 @@ class RequestMockBuilder(object):
 class HttpMock(object):
   """Mock of httplib2.Http"""
 
-  def __init__(self, filename, headers):
+  def __init__(self, filename, headers=None):
     """
     Args:
       filename: string, absolute filename to read response from
       headers: dict, header to return with response
     """
+    if headers is None:
+      headers = {'status': '200 OK'}
     f = file(filename, 'r')
     self.data = f.read()
     f.close()
diff --git a/apiclient/model.py b/apiclient/model.py
index 68da13e..58cd624 100644
--- a/apiclient/model.py
+++ b/apiclient/model.py
@@ -2,7 +2,7 @@
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 
-"""Model objects for requests and responses
+"""Model objects for requests and responses.
 
 Each API may support one or more serializations, such
 as JSON, Atom, etc. The model classes are responsible