diff --git a/buzz_gae_client_tests.py b/buzz_gae_client_tests.py
index c318d95..487f57f 100644
--- a/buzz_gae_client_tests.py
+++ b/buzz_gae_client_tests.py
@@ -53,7 +53,7 @@ class BuzzGaeClientTest(unittest.TestCase):
       self.assertEquals(consumer_secret, usable_token['consumer_secret'])
       self.assertTrue(usable_token['access_token'] is not None)
 
-    def test_can_build_apiary_client_with_access_token(self):
+    def test_can_build_apiclient_with_access_token(self):
       client = buzz_gae_client.BuzzGaeClient()
       oauth_parameters = {}
       oauth_parameters['oauth_token'] = ''
@@ -71,4 +71,4 @@ class BuzzGaeClientTest(unittest.TestCase):
       self.assertEquals(count, len(activities))
 
 if __name__ == '__main__':
-  unittest.main()
\ No newline at end of file
+  unittest.main()
diff --git a/samples/api-python-client-doc/main.py b/samples/api-python-client-doc/main.py
index b92b18d..366f4b0 100755
--- a/samples/api-python-client-doc/main.py
+++ b/samples/api-python-client-doc/main.py
@@ -68,7 +68,7 @@ class MainHandler(webapp.RequestHandler):
       <li><a href='/customsearch/v1'>customsearch</a>
       <li><a href='/diacritize/v1'>diacritize</a>
       <li><a href='/translate/v2'>translate</a>
-      <li><a href='/prediction/v1'>prediction</a>
+      <li><a href='/prediction/v1.1'>prediction</a>
     </ul>
     """)
 
@@ -119,8 +119,8 @@ def main():
   application = webapp.WSGIApplication(
       [
       (r'/', MainHandler),
-      (r'/(\w*)/(\w*)', ServiceHandler),
-      (r'/(\w*)/(\w*)/(.*)', CollectionHandler),
+      (r'/([^\/]*)/([^\/]*)', ServiceHandler),
+      (r'/([^\/]*)/([^\/]*)/(.*)', CollectionHandler),
       ],
       debug=True)
   util.run_wsgi_app(application)
diff --git a/tests/data/zoo.json b/tests/data/zoo.json
index 9a5e44a..50b2e55 100644
--- a/tests/data/zoo.json
+++ b/tests/data/zoo.json
@@ -1,7 +1,7 @@
 {
  "name": "zoo",
  "version": "v1",
- "description": "Zoo API used for Apiary testing",
+ "description": "Zoo API used for testing",
  "restBasePath": "/zoo",
  "rpcPath": "/rpc",
  "resources": {