diff --git a/letsencrypt/client/network2.py b/letsencrypt/client/network2.py
index e26ee741e..26de5f865 100644
--- a/letsencrypt/client/network2.py
+++ b/letsencrypt/client/network2.py
@@ -530,8 +530,7 @@ class Network(object):
 
         """
         if certr.cert_chain_uri is not None:
-            _, cert = self._get_cert(certr.cert_chain_uri)
-            return cert
+            return self._get_cert(certr.cert_chain_uri)[1]
 
     def revoke(self, certr, when=messages2.Revocation.NOW):
         """Revoke certificate.
diff --git a/letsencrypt/client/plugins/nginx/tests/configurator_test.py b/letsencrypt/client/plugins/nginx/tests/configurator_test.py
index 0ac0fd8bc..cb5fef6bf 100644
--- a/letsencrypt/client/plugins/nginx/tests/configurator_test.py
+++ b/letsencrypt/client/plugins/nginx/tests/configurator_test.py
@@ -5,6 +5,7 @@ import unittest
 import mock
 
 from letsencrypt.acme import challenges
+from letsencrypt.acme import messages2
 
 from letsencrypt.client import achallenges
 from letsencrypt.client import errors
@@ -166,15 +167,21 @@ class NginxConfiguratorTest(util.NginxTest):
         # Note: As more challenges are offered this will have to be expanded
         auth_key = le_util.Key(self.rsa256_file, self.rsa256_pem)
         achall1 = achallenges.DVSNI(
-            chall=challenges.DVSNI(
-                r="foo",
-                nonce="bar"),
-            domain="localhost", key=auth_key)
+            challb=messages2.ChallengeBody(
+                chall=challenges.DVSNI(
+                    r="foo",
+                    nonce="bar"),
+                uri="https://ca.org/chall0_uri",
+                status=messages2.Status("pending"),
+            ), domain="localhost", key=auth_key)
         achall2 = achallenges.DVSNI(
-            chall=challenges.DVSNI(
-                r="abc",
-                nonce="def"),
-            domain="example.com", key=auth_key)
+            challb=messages2.ChallengeBody(
+                chall=challenges.DVSNI(
+                    r="abc",
+                    nonce="def"),
+                uri="https://ca.org/chall1_uri",
+                status=messages2.Status("pending"),
+            ), domain="example.com", key=auth_key)
 
         dvsni_ret_val = [
             challenges.DVSNIResponse(s="irrelevant"),
diff --git a/letsencrypt/client/plugins/nginx/tests/dvsni_test.py b/letsencrypt/client/plugins/nginx/tests/dvsni_test.py
index a6dfac2e2..66e0cc704 100644
--- a/letsencrypt/client/plugins/nginx/tests/dvsni_test.py
+++ b/letsencrypt/client/plugins/nginx/tests/dvsni_test.py
@@ -6,6 +6,7 @@ import shutil
 import mock
 
 from letsencrypt.acme import challenges
+from letsencrypt.acme import messages2
 
 from letsencrypt.client import achallenges
 from letsencrypt.client import le_util
@@ -35,16 +36,24 @@ class DvsniPerformTest(util.NginxTest):
 
         self.achalls = [
             achallenges.DVSNI(
-                chall=challenges.DVSNI(
-                    r="foo",
-                    nonce="bar",
+                challb=messages2.ChallengeBody(
+                    chall=challenges.DVSNI(
+                        r="foo",
+                        nonce="bar",
+                    ),
+                    uri="https://letsencrypt-ca.org/chall0_uri",
+                    status=messages2.Status("pending"),
                 ), domain="www.example.com", key=auth_key),
             achallenges.DVSNI(
-                chall=challenges.DVSNI(
-                    r="\xba\xa9\xda?<m\xaewmx\xea\xad\xadv\xf4\x02\xc9y\x80"
-                      "\xe2_X\t\xe7\xc7\xa4\t\xca\xf7&\x945",
-                    nonce="Y\xed\x01L\xac\x95\xf7pW\xb1\xd7"
-                          "\xa1\xb2\xc5\x96\xba",
+                challb=messages2.ChallengeBody(
+                    chall=challenges.DVSNI(
+                        r="\xba\xa9\xda?<m\xaewmx\xea\xad\xadv\xf4\x02\xc9y\x80"
+                          "\xe2_X\t\xe7\xc7\xa4\t\xca\xf7&\x945",
+                        nonce="Y\xed\x01L\xac\x95\xf7pW\xb1\xd7"
+                              "\xa1\xb2\xc5\x96\xba",
+                    ),
+                    uri="https://letsencrypt-ca.org/chall1_uri",
+                    status=messages2.Status("pending"),
                 ), domain="blah", key=auth_key),
         ]
 
diff --git a/letsencrypt/client/tests/network2_test.py b/letsencrypt/client/tests/network2_test.py
index c4d00f1ec..f263dce9e 100644
--- a/letsencrypt/client/tests/network2_test.py
+++ b/letsencrypt/client/tests/network2_test.py
@@ -9,12 +9,13 @@ import M2Crypto
 import mock
 import requests
 
-from letsencrypt.client import errors
-
 from letsencrypt.acme import challenges
 from letsencrypt.acme import jose
 from letsencrypt.acme import messages2
 
+from letsencrypt.client import account
+from letsencrypt.client import errors
+
 
 CERT = jose.ComparableX509(M2Crypto.X509.load_cert_string(
     pkg_resources.resource_string(
@@ -196,6 +197,30 @@ class NetworkTest(unittest.TestCase):
         self.assertRaises(
             errors.NetworkError, self.net.register, self.regr.body)
 
+    def test_register_from_account(self):
+        self.net.register = mock.Mock()
+        acc = account.Account(
+            mock.Mock(accounts_dir='mock_dir'), 'key',
+            email='cert-admin@example.com', phone='+12025551212')
+
+        self.net.register_from_account(acc)
+
+        self.net.register.assert_called_with(contact=self.contact)
+
+    def test_register_from_account_partial_info(self):
+        self.net.register = mock.Mock()
+        acc = account.Account(
+            mock.Mock(accounts_dir='mock_dir'), 'key',
+            email='cert-admin@example.com')
+        acc2 = account.Account(mock.Mock(accounts_dir='mock_dir'), 'key')
+
+        self.net.register_from_account(acc)
+        self.net.register.assert_called_with(
+            contact=('mailto:cert-admin@example.com',))
+
+        self.net.register_from_account(acc2)
+        self.net.register.assert_called_with(contact=())
+
     def test_update_registration(self):
         self.response.headers['Location'] = self.regr.uri
         self.response.json.return_value = self.regr.body.to_json()
@@ -428,7 +453,8 @@ class NetworkTest(unittest.TestCase):
     def test_fetch_chain(self):
         # pylint: disable=protected-access
         self.net._get_cert = mock.MagicMock()
-        self.assertEqual(self.net._get_cert(self.certr.cert_chain_uri),
+        self.net._get_cert.return_value = ("response", "certificate")
+        self.assertEqual(self.net._get_cert(self.certr.cert_chain_uri)[1],
                          self.net.fetch_chain(self.certr))
 
     def test_fetch_chain_no_up_link(self):