diff --git a/backend/secfit/users/tests/__init__.py b/backend/secfit/users/tests/__init__.py
index 0b70d0cc707c8333a366e109f2b7e4ded74acfc2..c55e9171bc009b91e52d75b41583c1b64798bd19 100644
--- a/backend/secfit/users/tests/__init__.py
+++ b/backend/secfit/users/tests/__init__.py
@@ -1,3 +1,4 @@
 from users.tests.registration import *
 from users.tests.userserializer import *
-from users.tests.twowaydomain import *
\ No newline at end of file
+from users.tests.twowaydomain import *
+from users.tests.rememberme import *
\ No newline at end of file
diff --git a/backend/secfit/users/tests/__pycache__/__init__.cpython-39.pyc b/backend/secfit/users/tests/__pycache__/__init__.cpython-39.pyc
index 27ee22dd7a27fee3745e1e88602a950186e7b181..6921f31b1d86262ba73498c36a1637a08351a9bd 100644
Binary files a/backend/secfit/users/tests/__pycache__/__init__.cpython-39.pyc and b/backend/secfit/users/tests/__pycache__/__init__.cpython-39.pyc differ
diff --git a/backend/secfit/users/tests/__pycache__/registration.cpython-39.pyc b/backend/secfit/users/tests/__pycache__/registration.cpython-39.pyc
index 761b80997ac825276a337b14ff73445e69f5b7a9..bc6227c0e731a32fab3c1a4ff7131f6f1e198459 100644
Binary files a/backend/secfit/users/tests/__pycache__/registration.cpython-39.pyc and b/backend/secfit/users/tests/__pycache__/registration.cpython-39.pyc differ
diff --git a/backend/secfit/users/tests/__pycache__/rememberme.cpython-39.pyc b/backend/secfit/users/tests/__pycache__/rememberme.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..20eb26f0d456f0966e2f57e0f32353a25dbe396c
Binary files /dev/null and b/backend/secfit/users/tests/__pycache__/rememberme.cpython-39.pyc differ
diff --git a/backend/secfit/users/tests/registration.py b/backend/secfit/users/tests/registration.py
index baf5d3d4e14bde7ea12fc52dc6f67091bbe71bc7..ea159533ce9ee33fa0ee5c3bb56e1b1c87362315 100644
--- a/backend/secfit/users/tests/registration.py
+++ b/backend/secfit/users/tests/registration.py
@@ -1,7 +1,6 @@
 import json
 
 from django.test import TestCase, RequestFactory, Client
-from users.serializers import UserSerializer
 from users.models import User
 
 url = "/api/users/"
diff --git a/backend/secfit/users/tests/rememberme.py b/backend/secfit/users/tests/rememberme.py
new file mode 100644
index 0000000000000000000000000000000000000000..207e3c47730ec8797bdce35e86b7e07a9fd1d637
--- /dev/null
+++ b/backend/secfit/users/tests/rememberme.py
@@ -0,0 +1,27 @@
+import json
+
+from django.test import TestCase, RequestFactory, Client
+from rest_framework.test import APIRequestFactory, APIClient
+from users.serializers import UserSerializer
+from users.models import User
+from workouts.views import RememberMe
+
+url = '/api/remember_me/'
+
+class RemembermeTestCase(TestCase):
+    """Django test for the rememberme functionality
+
+    tests:
+        set_up:                 Set up everything needed for the test
+        test_rememberme: Tests creation of rememberme for authenticated user
+    """
+
+    def setUp(self):
+        self.client = APIClient()
+        self.user = User.objects.create(username="user",password="test")
+        self.client.force_authenticate(user=self.user)
+
+    def test_rememberme(self):
+        data = {"username": "user", "password": "test"}
+        response = self.client.get(url, data)
+        self.assertEqual(response.status_code, 200)
\ No newline at end of file
diff --git a/backend/secfit/workouts/tests/__init__.py b/backend/secfit/workouts/tests/__init__.py
index 587490d2e555ef094e6e1b4090d4519353c6dd91..40c1f2dad94087bdfc5e5b7bc6918235bef0d1b1 100644
--- a/backend/secfit/workouts/tests/__init__.py
+++ b/backend/secfit/workouts/tests/__init__.py
@@ -1,4 +1,5 @@
 from workouts.tests.permissions import *
 from workouts.tests.workouts import *
 from workouts.tests.visibility import *
-from workouts.tests.features import *
\ No newline at end of file
+from workouts.tests.features import *
+from workouts.tests.workoutfiles import *
diff --git a/backend/secfit/workouts/tests/__pycache__/__init__.cpython-39.pyc b/backend/secfit/workouts/tests/__pycache__/__init__.cpython-39.pyc
index 1d9f50cd3ec369c73736fa2bed9ed0b4b6b5fa3e..bf6672fde4fc32647b1984a518b592a3c3328abe 100644
Binary files a/backend/secfit/workouts/tests/__pycache__/__init__.cpython-39.pyc and b/backend/secfit/workouts/tests/__pycache__/__init__.cpython-39.pyc differ
diff --git a/backend/secfit/workouts/tests/__pycache__/workoutfiles.cpython-39.pyc b/backend/secfit/workouts/tests/__pycache__/workoutfiles.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..70699ee7da46968f6914bda16cefe9bb5e83966d
Binary files /dev/null and b/backend/secfit/workouts/tests/__pycache__/workoutfiles.cpython-39.pyc differ
diff --git a/backend/secfit/workouts/tests/workoutfiles.py b/backend/secfit/workouts/tests/workoutfiles.py
new file mode 100644
index 0000000000000000000000000000000000000000..f06448411f2ad985808e25fb3cc292ab878c4408
--- /dev/null
+++ b/backend/secfit/workouts/tests/workoutfiles.py
@@ -0,0 +1,33 @@
+import json
+
+from django.test import TestCase, RequestFactory, Client
+from rest_framework.test import APIRequestFactory, APIClient
+from workouts.models import Workout, Exercise, ExerciseInstance, WorkoutFile
+from workouts.serializers import WorkoutSerializer
+from users.models import User
+
+class WorkoutFilesTestCase(TestCase):
+    """Django test for perserving the functionality of workout-files
+
+    tests:
+        set_up:                 Set up everything needed for the test
+    """
+    def setUp(self):
+        self.user = User.objects.create(username="user")
+        self.workout = Workout.objects.create(name="workout", date="2021-03-06T18:00:00Z", notes="note", owner=self.user, visibility="PU")
+        self.exercise = Exercise.objects.create(name="exercise", description="test", unit="test")
+        
+    def test_workout_files(self):
+        data = {'name': 'workout', 'notes': 'note', 'visibility': 'PU',
+                    'date': '2021-03-06T18:00:00.000Z', 
+                    'exercise_instances': [{'exercise': self.exercise, 'sets':12, 'number':12}],
+                    'files': [{'owner': self.user, 'file':'workouts/1/document.pdf'}]
+        }
+        WorkoutSerializer(data).update(self.workout, data)
+
+        instance = ExerciseInstance.objects.filter(workout=self.workout).first()
+        self.assertEqual(instance.exercise, self.exercise)
+
+        files = WorkoutFile.objects.filter(workout=self.workout).first()
+        self.assertEqual(files.owner, self.user)
+        self.assertEqual(files.file, 'workouts/1/document.pdf')