balanced
diff --git a/‎tests/acceptance_suite.py
Lines changed: 18 additions & 13 deletions b/‎tests/acceptance_suite.py
Lines changed: 18 additions & 13 deletions
@@ -58,21 +58,26 @@ def test_00_merchant_expectations(self):
         mps = balanced.Marketplace.query.all()
         self.assertEqual(len(mps), 1)
 
+    def _create_buyer_account(self):
+        mp = balanced.Marketplace.query.one()
+        card_payload = dict(self.us_card_payload)
+        card = balanced.Card(**card_payload).save()
+        card_uri = card.uri
+        buyer = mp.create_buyer(
+            email_address='albert@einstein.com',
+            card_uri=card_uri,
+            meta={'foo': 'bar'},
+        )
+        return buyer
+
     def _find_buyer_account(self):
         mp = balanced.Marketplace.query.one()
         accounts = list(mp.accounts)
         filtered_accounts = [
             account for account in accounts if account.roles == ['buyer']
             ]
         if not filtered_accounts:
-            card_payload = dict(self.us_card_payload)
-            card = balanced.Card(**card_payload).save()
-            card_uri = card.uri
-            buyer = mp.create_buyer(
-                email_address='albert@einstein.com',
-                card_uri=card_uri,
-                meta={'foo': 'bar'},
-            )
+            buyer = self._create_buyer_account()
         else:
             buyer = filtered_accounts[0]
         return buyer
@@ -94,7 +99,7 @@ def test_valid_non_us_address_no_postal_code(self):
         balanced.Card(**card_payload).save()
 
     def test_valid_us_address(self):
-        buyer = self._find_buyer_account()
+        buyer = self._create_buyer_account()
         self.assertTrue(buyer.id.startswith('AC'), buyer.id)
         self.assertEqual(buyer.roles, ['buyer'])
         self.assertDictEqual(buyer.meta, {'foo': 'bar'})
@@ -233,15 +238,15 @@ def test_transactions_invalid_funding_sources(self):
         the_exception = exc.exception
         self.assertEqual(the_exception.status_code, 409)
         self.assertEqual(the_exception.category_code,
-            'funding-source-not-valid')
+            'bad-funding-info')
 
         with self.assertRaises(requests.HTTPError) as exc:
             # ... and explicitly
             buyer.debit(7000, source_uri=card.uri)
         the_exception = exc.exception
         self.assertEqual(the_exception.status_code, 409)
         self.assertEqual(the_exception.category_code,
-            'funding-source-not-valid')
+            'bad-funding-info')
 
         with self.assertRaises(requests.HTTPError) as exc:
             buyer.credit(8000)
@@ -356,14 +361,14 @@ def test_zzz_remove_owner_merchant_account_bank_account(self):
             owner.debit(600)
         the_exception = exc.exception
         self.assertEqual(the_exception.status_code, 409)
-        self.assertEqual('funding-source-not-valid',
+        self.assertEqual('bad-funding-info',
             the_exception.category_code)
 
         with self.assertRaises(requests.HTTPError) as exc:
             owner.credit(900)
         the_exception = exc.exception
         self.assertEqual(the_exception.status_code, 409)
-        self.assertEqual('funding-destination-not-valid',
+        self.assertEqual('bad-funding-info',
             the_exception.category_code)