Fixes for some coverage tests. Also fix functional test, and make verbosity controls apply better.
diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index 9eec549..3d30fbd 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -30,9 +30,9 @@
import urlparse
from apiclient.http import HttpRequest
-try:
+try: # pragma: no cover
import simplejson
-except ImportError:
+except ImportError: # pragma: no cover
try:
# Try to import from django, should work on App Engine
from django.utils import simplejson