diff --git a/rowers/models.py b/rowers/models.py
index fff029cc..55abd552 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -2507,10 +2507,12 @@ class PlannedSession(models.Model):
             steps = steps_read_fit(os.path.join(settings.MEDIA_ROOT,self.fitfile.name))
             self.steps = steps
 
+
         if self.steps and not self.fitfile:
             filename = 'aap.fit'
             filename = get_file_path(self,filename)
 
+
             steps = self.steps
             steps['filename'] = os.path.join(settings.MEDIA_ROOT,filename)
             fitfile = steps_write_fit(steps)
diff --git a/rowers/rows.py b/rowers/rows.py
index 8f1c3643..f2d830ec 100644
--- a/rowers/rows.py
+++ b/rowers/rows.py
@@ -140,8 +140,10 @@ def handle_uploaded_image(i): # pragma: no cover
 
 def handle_uploaded_file(f):
     fname = f.name
-    timestr = uuid.uuid4().hex[:10]+'-'+time.strftime("%Y%m%d-%H%M%S")
-    fname = timestr+'-'+fname
+    ext = fname.split('.')[-1]
+    fname = '%s.%s' % (uuid.uuid4(),ext)
+    #timestr = uuid.uuid4().hex[:10]+'-'+time.strftime("%Y%m%d-%H%M%S")
+    #fname = timestr+'-'+fname
     fname2 = 'media/'+fname
     with open(fname2,'wb+') as destination:
         for chunk in f.chunks():
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
deleted file mode 100644
index f9743e9b..00000000
Binary files a/rowers/tests/testdata/testdata.tcx.gz and /dev/null differ