diff --git a/rowers/tests/test_teams.py b/rowers/tests/test_team.py
similarity index 84%
rename from rowers/tests/test_teams.py
rename to rowers/tests/test_team.py
index 5bb8d1a4..161d5325 100644
--- a/rowers/tests/test_teams.py
+++ b/rowers/tests/test_team.py
@@ -13,7 +13,7 @@ class TeamFactory(factory.DjangoModelFactory):
     private = 'open'
     viewing = 'allmembers'
 
-class TeamCreateTest(TestCase):
+class TeamTest(TestCase):
     def setUp(self):
         redis_connection.publish('tasks','KILL')
         self.user_passwords = []
@@ -67,12 +67,14 @@ class TeamCreateTest(TestCase):
             code = 'abcde',
             email = self.users[1].email
             )
+        self.invite.save()
 
-        self.request = TeamRequest(
+        self.rekwest = TeamRequest(
             team = self.t,
             user = self.users[2],
             code ='abcde'
             )
+        self.rekwest.save()
 
     def tearDown(self):
         for csvfilename in self.csvfilenames:
@@ -196,10 +198,10 @@ class TeamCreateTest(TestCase):
                              expected_url='/rowers/team/{t}/'.format(t=self.t.id),
                              status_code=302,target_status_code=200)
 
-        login = self.c.login(username=self.users[1].username, password = self.user_passwords[1])
+        login = self.c.login(username=self.users[2].username, password = self.user_passwords[2])
         self.assertTrue(login)
 
-        url = '/rowers/me/invitation/{id}/revoke/'.format(id=self.invite.id)
+        url = '/rowers/me/request/{id}/revoke/'.format(id=self.rekwest.id)
         self.assertRedirects(response,
                              expected_url='/rowers/team/{t}/'.format(t=self.t.id),
                              status_code=302,target_status_code=200)
@@ -207,13 +209,11 @@ class TeamCreateTest(TestCase):
         response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code,200)
 
-        id, result = create_request(self.t,self.users[2].id)
-        self.assertTrue(id != 0)
-
+    def test_teamview_manager_request(self):
         login = self.c.login(username=self.u.username, password = self.password)
         self.assertTrue(login)
 
-        url = '/rowers/me/invitation/{id}/reject/'.format(id=id)
+        url = '/rowers/me/request/{id}/reject/'.format(id=self.rekwest.id)
         response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code,200)
         self.assertRedirects(response,
@@ -236,6 +236,60 @@ class TeamCreateTest(TestCase):
         self.assertEqual(response.status_code, 200)
             
         
+class TeamTestLowLevel(TestCase):
+    def setUp(self):
+        redis_connection.publish('tasks','KILL')
+        self.user_passwords = []
+        usernames = [
+            'user1',
+            'user2',
+            'user3',
+            'user4',
+            'user5',
+            'user6',
+        ]
+        self.users = []
+        self.csvfilenames = []
+
+        for i in range(6):
+            u = UserFactory(username=usernames[i])
+            self.users.append(u)
+        
+            r = Rower.objects.create(
+                birthdate=faker.profile()['birthdate'],
+                gdproptin=True,
+                gdproptindate=timezone.now(),
+                rowerplan='coach',
+                user=u,
+                clubsize=3
+            )
+            r.save()
+
+            password = faker.word()
+            u.set_password(password)
+            u.save()
+            self.user_passwords.append(password)
+            
+
+            workouts = WorkoutFactory.create_batch(5, user=r)
+            for w in workouts:
+                self.csvfilenames.append(w.csvfilename)
+
+
+        self.c = Client()
+
+        self.u = self.users[0]
+        self.password = self.user_passwords[0]
+        
+        self.t = TeamFactory(manager=self.u)
+
+
+    def tearDown(self):
+        for csvfilename in self.csvfilenames:
+            try:
+                os.remove(csvfilename)
+            except (IOError, WindowsError):
+                pass
 
     def test_lowlevel_update_team(self):
         id, comment = update_team(self.t,faker.word(),self.u,'open',faker.text(),'allmembers')
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 1525914f..1a4b3abb 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 fe69fc36..48a0d577 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 0x13699b70&gt;</Notes>
-=======
-      <Notes>&lt;Element 'Notes' at 0x1913e400&gt;</Notes>
->>>>>>> develop
+      <Notes>&lt;Element 'Notes' at 0x141312e8&gt;</Notes>
     </Activity>
   </Activities>
   <Creator>