diff --git a/rowers/tests.py b/rowers/tests.py
index 96b2bb91..b481c5a1 100644
--- a/rowers/tests.py
+++ b/rowers/tests.py
@@ -29,6 +29,8 @@ from rowers.views import error500_view,error404_view,error400_view,error403_view
 
 from dataprep import delete_strokedata
 
+from redis import StrictRedis
+redis_connection = StrictRedis()
 
 
 
@@ -299,6 +301,7 @@ class TestErrorPages(TestCase):
 class NewUserRegistrationTest(TestCase):
     def setUp(self):
 	self.c = Client()
+        redis_connection.publish('tasks','KILL')
 
     def test_newuser(self):
         form_data = {
@@ -323,6 +326,7 @@ class NewUserRegistrationTest(TestCase):
         
 class WorkoutTests(TestCase):
     def setUp(self):
+        redis_connection.publish('tasks','KILL')
 	u = User.objects.create_user('john',
 				     'sander@ds.ds',
 				     'koeinsloot')
@@ -342,6 +346,7 @@ class WorkoutTests(TestCase):
 
 class C2Tests(TestCase):
     def setUp(self):
+        redis_connection.publish('tasks','KILL')
 	self.u = User.objects.create_user('john',
 				     'sander@ds.ds',
 				     'koeinsloot')
@@ -359,6 +364,7 @@ class C2Tests(TestCase):
 
 class DataTest(TestCase):
     def setUp(self):
+        redis_connection.publish('tasks','KILL')
 	u = User.objects.create_user('john',
 				     'sander@ds.ds',
 				     'koeinsloot')
@@ -538,6 +544,7 @@ class DataTest(TestCase):
 
 class ViewTest(TestCase):
     def setUp(self):
+        redis_connection.publish('tasks','KILL')
 	self.c = Client()
 	self.u = User.objects.create_user('john',
 				     'sander@ds.ds',
@@ -1205,6 +1212,7 @@ class ViewTest(TestCase):
 
 class subroutinetests(TestCase):
     def setUp(self):
+        redis_connection.publish('tasks','KILL')
 	u = User.objects.create_user('john',
 				     'sander@ds.ds',
 				     'koeinsloot')
@@ -1229,6 +1237,7 @@ class subroutinetests(TestCase):
 
 class PlotTests(TestCase):
     def setUp(self):
+        redis_connection.publish('tasks','KILL')
 	u = User.objects.create_user('john',
 				     'sander@ds.ds',
 				     'koeinsloot')
diff --git a/templates/basebase.html b/templates/basebase.html
index e072a4cb..ce7c99a0 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -80,8 +80,8 @@ var current = null;
       js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.10&appId=694685920739849";
       fjs.parentNode.insertBefore(js, fjs);
       }(document, 'script', 'facebook-jssdk'));</script>
-    <link rel="stylesheet" href="http://webapiv2.navionics.com/dist/webapi/webapi.min.css" >
-    <script type="text/javascript" src="http://webapiv2.navionics.com/dist/webapi/webapi.min.no-dep.js"></script>
+    <link rel="stylesheet" href="https://webapiv2.navionics.com/dist/webapi/webapi.min.css" >
+    <script type="text/javascript" src="https://webapiv2.navionics.com/dist/webapi/webapi.min.no-dep.js"></script>
     <script>window.twttr = (function(d, s, id) {
   var js, fjs = d.getElementsByTagName(s)[0],
     t = window.twttr || {};