diff --git a/rowers/tests/mocks.py b/rowers/tests/mocks.py
index ecde94c8..64d0b882 100644
--- a/rowers/tests/mocks.py
+++ b/rowers/tests/mocks.py
@@ -224,6 +224,9 @@ class MockStravalibClient():
 
 ## Higher level - unfortunately didn't succeed in mocking the gateway
 
+def get_client_token(*args, **kwargs):
+    return "aap"
+
 def mock_create_customer(*args, **kwargs):
     return 121
 
diff --git a/rowers/tests/test_payments.py b/rowers/tests/test_payments.py
index 69bc2b37..61a9e5c6 100644
--- a/rowers/tests/test_payments.py
+++ b/rowers/tests/test_payments.py
@@ -54,7 +54,8 @@ class PaymentTest(TestCase):
         #       settings.DEBUG = False
 
     @patch('rowers.views.braintreestuff.create_customer',side_effect=mock_create_customer)
-    def test_billing_view(self,mocked_create_customer):
+    @patch('rowers.views.braintreestuff.gateway',side_effect=MockBraintreeGateway)
+    def test_billing_view(self,mocked_create_customer,mocked_gateway):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index cb45388f..a67f9afc 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/tests/testdata/testdata.tcx b/rowers/tests/testdata/testdata.tcx
index adb19770..57cf726e 100644
--- a/rowers/tests/testdata/testdata.tcx
+++ b/rowers/tests/testdata/testdata.tcx
@@ -2502,11 +2502,7 @@
           </Trackpoint>
         </Track>
       </Lap>
-<<<<<<< HEAD
-      <Notes>&lt;Element 'Notes' at 0x13db9b70&gt;</Notes>
-=======
-      <Notes>&lt;Element 'Notes' at 0x11aaf780&gt;</Notes>
->>>>>>> develop
+      <Notes>&lt;Element 'Notes' at 0x13f67128&gt;</Notes>
     </Activity>
   </Activities>
   <Creator>