diff --git a/rowers/tests/test_braintree.py b/rowers/tests/test_braintree.py
index 06787437..9b938dff 100644
--- a/rowers/tests/test_braintree.py
+++ b/rowers/tests/test_braintree.py
@@ -81,7 +81,8 @@ class BraintreeUnits(TestCase):
     @patch('rowers.fakturoid.requests.get',side_effect=mocked_requests)
     @patch('rowers.fakturoid.requests.post',side_effect=mocked_requests)
     @patch('rowers.braintreestuff.gateway', side_effect=MockBraintreeGateway)
-    def test_process_webhook(self,mock_get,mockpost,mocked_gateway):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_process_webhook(self,mock_get,mockpost,mocked_gateway,mocked_myqueue):
         n = notification()
         res = process_webhook(n)
         self.assertEqual(res,1)
@@ -99,7 +100,7 @@ class BraintreeUnits(TestCase):
             res = create_customer(self.r)
             self.assertEqual(res,1)
 
-    @patch('rowers.views.racesviews.myqueue')
+    @patch('rowers.braintreestuff.myqueue')
     def test_update_subscription(self, mocked_myqueue):
         data = {
             'plan':self.pp.id,
@@ -113,7 +114,7 @@ class BraintreeUnits(TestCase):
             self.assertTrue(success)
             self.assertEqual(amount,25)
 
-    @patch('rowers.views.racesviews.myqueue')
+    @patch('rowers.braintreestuff.myqueue')
     def test_create_subscription(self, mocked_myqueue):
         data = {
             'plan':self.p2.id,
diff --git a/rowers/tests/test_courses.py b/rowers/tests/test_courses.py
index b9d77bba..0e561593 100644
--- a/rowers/tests/test_courses.py
+++ b/rowers/tests/test_courses.py
@@ -22,7 +22,8 @@ class CourseUnitTest(TestCase):
         )
         self.nu = datetime.datetime.now()
 
-        cs = courses.kmltocourse('rowers/tests/testdata/thyro.kml')
+        with open('rowers/tests/testdata/thyro.kml') as f:
+            cs = courses.kmltocourse(f)
         course = cs[0]
         cname = course['name']
         cnotes = course['description']
@@ -139,23 +140,23 @@ class CoursesTest(TestCase):
         self.assertTrue(login)
 
         filename = 'rowers/tests/testdata/Courses.kml'
-        f = open(filename,'rb')
-        file_data = {'file': f}
-        form_data = {
-            'name': 'test courses',
-            'notes': 'aap nn',
-            'file':f,
+        with open(filename,'rb') as f:
+            file_data = {'file': f}
+            form_data = {
+                'name': 'test courses',
+                'notes': 'aap nn',
+                'file':f,
             }
 
-        courseform = CourseForm(form_data)
-        self.assertTrue(courseform.is_valid())
+            courseform = CourseForm(form_data)
+            self.assertTrue(courseform.is_valid())
 
-        response = self.c.get('/rowers/courses/upload/')
-        self.assertTrue(response.status_code,200)
+            response = self.c.get('/rowers/courses/upload/')
+            self.assertTrue(response.status_code,200)
 
-        response = self.c.post('/rowers/courses/upload/', form_data, follow=True)
+            response = self.c.post('/rowers/courses/upload/', form_data, follow=True)
 
-        f.close()
+        
 
         self.assertRedirects(response, expected_url='/rowers/list-courses/',
                              status_code=302,target_status_code=200)
diff --git a/rowers/tests/test_payments.py b/rowers/tests/test_payments.py
index 29c3d15e..8531525d 100644
--- a/rowers/tests/test_payments.py
+++ b/rowers/tests/test_payments.py
@@ -159,7 +159,8 @@ description: ""
         #       settings.DEBUG = False
 
     @patch('rowers.braintreestuff.gateway',side_effect=MockBraintreeGateway)
-    def test_braintree_webhook(self,mocked_gateway):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_braintree_webhook(self,mocked_gateway,mocked_myqueue):
         url = reverse('braintree_webhook_view')
         response = self.c.get(url)
 
@@ -175,7 +176,8 @@ description: ""
 
     @patch('rowers.views.braintreestuff.create_customer',side_effect=mock_create_customer)
     @patch('rowers.views.braintreestuff.gateway',side_effect=MockBraintreeGateway)
-    def test_billing_view(self,mocked_create_customer,mocked_gateway):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_billing_view(self,mocked_create_customer,mocked_gateway,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -233,7 +235,8 @@ description: ""
                              status_code=302,target_status_code=200)
 
     @patch('rowers.views.braintreestuff.gateway',side_effect=MockBraintreeGateway)
-    def test_upgrade_view(self,mocked_gateway):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_upgrade_view(self,mocked_gateway,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -296,7 +299,8 @@ description: ""
                              status_code=302,target_status_code=200)
 
     @patch('rowers.views.braintreestuff.gateway',side_effect=MockBraintreeGateway)
-    def test_down_view(self,mocked_gateway):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_down_view(self,mocked_gateway,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -362,7 +366,8 @@ description: ""
                              status_code=302,target_status_code=200)
 
     @patch('rowers.views.braintreestuff.gateway',side_effect=MockBraintreeGateway)
-    def test_planstop_view(self,mocked_gateway):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_planstop_view(self,mocked_gateway,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -401,7 +406,8 @@ description: ""
 
     @patch('rowers.views.braintreestuff.gateway', side_effect=MockBraintreeGateway)
     @patch('rowers.fakturoid.create_invoice',side_effect=mocked_invoiceid)
-    def test_purchase_trainingplan_view(self, mocked_gateway,mocked_invoiceid):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_purchase_trainingplan_view(self, mocked_gateway,mocked_invoiceid,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -494,7 +500,8 @@ description: ""
                              status_code=302,target_status_code=200)
 
     @patch('rowers.views.braintreestuff.gateway',side_effect=MockBraintreeGateway)
-    def test_planstobasic_view(self,mocked_gateway):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_planstobasic_view(self,mocked_gateway,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -534,7 +541,8 @@ description: ""
                              status_code=302,target_status_code=200)
 
     @patch('rowers.tests.test_payments.mocktest', side_effect=mock_mocktest)
-    def test_patch(self, mock_mocktest):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_patch(self, mock_mocktest,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -555,7 +563,8 @@ description: ""
         self.assertEqual(result,'121')
 
     @patch('rowers.views.braintreestuff.create_subscription', side_effect=mock_create_subscription)
-    def test_checkouts_view(self,mock_subscription):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_checkouts_view(self,mock_subscription,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -601,7 +610,8 @@ description: ""
 
 
     @patch('rowers.views.braintreestuff.update_subscription', side_effect=mock_update_subscription)
-    def test_upgrade_checkouts_view(self,mock_subscription):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_upgrade_checkouts_view(self,mock_subscription,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -646,7 +656,8 @@ description: ""
                              status_code=302,target_status_code=200)
 
     @patch('rowers.views.braintreestuff.update_subscription', side_effect=mock_update_subscription)
-    def test_downgrade_checkouts_view(self,mock_subscription):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_downgrade_checkouts_view(self,mock_subscription,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -691,7 +702,8 @@ description: ""
                              status_code=302,target_status_code=200)
 
     @patch('rowers.views.braintreestuff.create_subscription', side_effect=mock_create_subscription)
-    def test_checkouts_view(self,mock_subscription):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_checkouts_view(self,mock_subscription,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -741,7 +753,8 @@ description: ""
 
 
     @patch('rowers.views.braintreestuff.update_subscription', side_effect=mock_update_subscription)
-    def test_upgrade_checkouts_view(self,mock_subscription):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_upgrade_checkouts_view(self,mock_subscription,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
@@ -786,7 +799,8 @@ description: ""
                              status_code=302,target_status_code=200)
 
     @patch('rowers.views.braintreestuff.update_subscription', side_effect=mock_update_subscription)
-    def test_downgrade_checkouts_view(self,mock_subscription):
+    @patch('rowers.braintreestuff.myqueue')
+    def test_downgrade_checkouts_view(self,mock_subscription,mocked_myqueue):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],