diff --git a/rowers/templates/plannedsessionteamedit.html b/rowers/templates/plannedsessionteamedit.html
index a688d92b..5bec388a 100644
--- a/rowers/templates/plannedsessionteamedit.html
+++ b/rowers/templates/plannedsessionteamedit.html
@@ -67,7 +67,7 @@
         <a href="/rowers/sessions/{{ plannedsession.id }}/clone">Clone</a>
       </p>
       <p>
-        <input class="button green" type="submit" value="Save">
+        <input type="submit" value="Save">
       </p>
     <div id="id_guidance" class="padded">
 
diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py
index e6c93f0a..cbd061f4 100644
--- a/rowers/tests/test_plans.py
+++ b/rowers/tests/test_plans.py
@@ -1207,7 +1207,7 @@ class PlannedSessionsView(TestCase):
 
         self.ps_trimp.save()
         added = plannedsessions.add_rower_session(self.u.rower,self.ps_trimp)
-        
+        added = plannedsessions.add_team_session(self.team,self.ps_trimp)
 
     def tearDown(self):
         try:
@@ -1224,10 +1224,7 @@ class PlannedSessionsView(TestCase):
         b = datetime.date.today()-timezone.timedelta(today.weekday())
         e = b+timezone.timedelta(days=6)
 
-        expected_url = '/rowers/sessions/5/edit/user/1/?when={b}/{e}'.format(
-            b=b,
-            e=e
-            )
+        expected_url = '/rowers/sessions/teamedit/5/'
 
         response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code,200)
@@ -1316,7 +1313,7 @@ class PlannedSessionsView(TestCase):
         self.assertEqual(response.status_code,200)
 
         form_data = {
-            'team':[1],
+            'team':[self.team.id],
             'startdate': self.w1.startdatetime.date(),
             'enddate': (self.w1.startdatetime+datetime.timedelta(days=5)).date(),
             'preferreddate': self.w1.startdatetime.date(),
@@ -1326,7 +1323,7 @@ class PlannedSessionsView(TestCase):
             'criterium': 'none',
             'sessionvalue': 13000,
             'sessionunit': 'm',
-            'course': None,
+            'course': '',
             'comment':faker.text()
             }
 
@@ -1346,36 +1343,152 @@ class PlannedSessionsView(TestCase):
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
 
+    
+        url = '/rowers/sessions/teamedit/{id}/'.format(id=self.ps_trimp.id)
+
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+        form_data = {
+            'team':[1],
+            'startdate': self.w1.startdatetime.date(),
+            'enddate': (self.w1.startdatetime+datetime.timedelta(days=5)).date(),
+            'preferreddate': self.w1.startdatetime.date(),
+            'name': faker.word(),
+            'sessiontype': 'session',
+            'sessionmode': 'distance',
+            'criterium': 'none',
+            'sessionvalue': 13000,
+            'sessionunit': 'm',
+            'course': None,
+            'comment':faker.text(),
+            'members': [self.r.id,self.r2.id]
+            }
+
+        response = self.c.post(url,follow=True)
+        self.assertEqual(response.status_code,200)
+
+
     def test_coach_view(self):
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
 
+        url = '/rowers/sessions/coach/?when={d1}/{d2}'.format(
+            d1=self.ps_trimp.startdate.strftime("%Y-%m%d"),
+            d2=self.ps_trimp.enddate.strftime("%Y-%m%d")
+            )
+
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+        
+
     def test_plannedsessions_view(self):
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
         
+        url = '/rowers/sessions/?when={d1}/{d2}'.format(
+            d1=self.ps_trimp.startdate.strftime("%Y-%m%d"),
+            d2=self.ps_trimp.enddate.strftime("%Y-%m%d")
+            )
+
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+        
     def test_plannedsessions_print_view(self):
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
         
-    def plannedsession_manage_view(self):
+        url = '/rowers/sessions/print/?when={d1}/{d2}'.format(
+            d1=self.ps_trimp.startdate.strftime("%Y-%m%d"),
+            d2=self.ps_trimp.enddate.strftime("%Y-%m%d")
+            )
+
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+        
+    def test_plannedsession_manage_view(self):
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
 
-    def plannedsession_edit_view(self):
+        url = '/rowers/sessions/manage/session/{id}/?when={d1}/{d2}'.format(
+            d1=self.ps_trimp.startdate.strftime("%Y-%m%d"),
+            d2=self.ps_trimp.enddate.strftime("%Y-%m%d"),
+            id=self.ps_trimp.id,
+            )
+
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+    def test_plannedsession_edit_view(self):
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
         
+        url = '/rowers/sessions/{id}/edit/'.format(
+            id=self.ps_time.id,
+            )
 
-    def plannedsession_detach_view(self):
-        login = self.c.login(username=self.u.username, password=self.password)
-        self.assertTrue(login)
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
 
-    def plannedsession_view(self):
-        login = self.c.login(username=self.u.username, password=self.password)
-        self.assertTrue(login)
+        form_data = {
+            'startdate': self.w1.startdatetime.date(),
+            'enddate': (self.w1.startdatetime+datetime.timedelta(days=5)).date(),
+            'preferreddate': self.w1.startdatetime.date(),
+            'name': faker.word(),
+            'sessiontype': 'session',
+            'sessionmode': 'distance',
+            'criterium': 'none',
+            'sessionvalue': 13000,
+            'sessionunit': 'm',
+            'course': None,
+            'comment':faker.text(),
+            }
 
-    def plannedsession_delete_view(self):
+        response = self.c.post(url,follow=True)
+        self.assertEqual(response.status_code,200)
+
+
+    def test_plannedsession_detach_view(self):
+
+        self.ps_time.startdate = self.w1.date-datetime.timedelta(days=3)
+        self.ps_time.enddate = self.w1.date-datetime.timedelta(days=3)
+        self.ps_time.save()
+
+        self.w1.plannedsession = self.ps_time
+        self.w1.save()
+        
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
         
+        url = '/rowers/sessions/{psid}/detach/{id}/'.format(
+            psid=self.ps_time.id,
+            id = self.w1.id,
+            )
+
+        response = self.c.get(url,follow=True)
+        self.assertEqual(response.status_code,200)
+
+    def test_plannedsession_view(self):
+        login = self.c.login(username=self.u.username, password=self.password)
+        self.assertTrue(login)
+
+        url = '/rowers/sessions/{psid}/'.format(
+            psid = self.ps_time.id
+            )
+        
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+    def test_plannedsession_delete_view(self):
+        login = self.c.login(username=self.u.username, password=self.password)
+        self.assertTrue(login)
+
+        url = '/rowers/sessions/{psid}/delete/'.format(
+            psid = self.ps_time.id
+            )
+        
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+        response = self.c.post(url,follow=True)
+        self.assertEqual(response.status_code,200)
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 1130e114..38d7cb18 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/views.py b/rowers/views.py
index 45038b24..1df96516 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -14440,7 +14440,14 @@ def plannedsession_teamcreate_view(request,
         sessioncreateform = PlannedSessionForm(request.POST)
         sessionteamselectform = PlannedSessionTeamForm(
             request.user,request.POST
-        ) 
+        )
+
+        print sessioncreateform.is_valid(),'sessioncreateform'
+        print sessioncreateform.errors,'errors'
+        print sessionteamselectform.is_valid(),'teamselectform'
+        print sessionteamselectform.errors,'errors'
+        raise ValueError
+        
         if sessioncreateform.is_valid() and sessionteamselectform.is_valid():
             cd = sessioncreateform.cleaned_data
             startdate = cd['startdate']