Fix the tests and implement a fake stripe.

endpoints/api/user.py

@@ -1,19 +1,18 @@
 import logging
-import stripe
 import json
 
 from flask import request
 from flask.ext.login import logout_user
 from flask.ext.principal import identity_changed, AnonymousIdentity
 
-from app import app
+from app import app, billing as stripe
 from endpoints.api import (ApiResource, nickname, resource, validate_json_request, request_error,
                            log_action, internal_only, NotFound, require_user_admin,
                            InvalidToken, require_scope, format_date, hide_if, show_if)
 from endpoints.api.subscribe import subscribe
 from endpoints.common import common_login
 from data import model
-from data.plans import get_plan
+from data.billing import get_plan
 from auth.permissions import (AdministerOrganizationPermission, CreateRepositoryPermission,
                               UserAdminPermission, UserReadPermission)
 from auth.auth_context import get_authenticated_user