diff --git a/backend/secfit/users/tests.py b/backend/secfit/users/tests.py
index 6b66a60f1f25d971b1236b3d8bd033b11bdbd961..a8a6060b680b43bd310ba78abec63b4fac155f56 100644
--- a/backend/secfit/users/tests.py
+++ b/backend/secfit/users/tests.py
@@ -14,11 +14,11 @@ from unittest import skip
 import random
 
 
-
 '''
     Serializer tests
 '''
 
+
 class UserSerializerTestCase(APITestCase):
     # Set up test instance of a user and serialized data of that user
     def setUp(self):
@@ -88,7 +88,6 @@ class UserSerializerTestCase(APITestCase):
         ]))
     # Testing if serialized data matched the retrieved instance in the database
 
-
     def test_corresponding_id_field(self):
         serialized_data = self.serialized_user.data
         self.assertEqual(serialized_data[
@@ -122,8 +121,8 @@ class UserSerializerTestCase(APITestCase):
     def test_corresponding_city_field(self):
         serialized_data = self.serialized_user.data
         self.assertEqual(serialized_data[
-            "country"
-        ], self.user_attributes['country'])
+            "city"
+        ], self.user_attributes['city'])
 
     def test_corresponding_street_address_field(self):
         serialized_data = self.serialized_user.data
@@ -170,73 +169,68 @@ class UserSerializerTestCase(APITestCase):
             '12345678910'), self.data['password'])
 
 
-
-
-
-
-
 '''
     Boundary value tests
 '''
 
 defaultDataRegister = {
-        "username": "johnDoe", "email": "johnDoe@webserver.com", "password": "johnsPassword", "password1": "johnsPassword",  "phone_number": "11223344", "country": "Norway", "city": "Trondheim", "street_address": "Kongens gate 33"
-    }
+    "username": "johnDoe", "email": "johnDoe@webserver.com", "password": "johnsPassword", "password1": "johnsPassword",  "phone_number": "11223344", "country": "Norway", "city": "Trondheim", "street_address": "Kongens gate 33"
+}
 counter = 0
 
 
 class UsernameBoundaryTestCase(TestCase):
     @skip("Skip so pipeline will pass")
     def test_empty_username(self):
-        defaultDataRegister["username"]=""
+        defaultDataRegister["username"] = ""
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_1_boundary(self):
-        defaultDataRegister["username"]="k"
+        defaultDataRegister["username"] = "k"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_2_boundary(self):
-        defaultDataRegister["username"]="kk"
+        defaultDataRegister["username"] = "kk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_49_boundary(self):
-        defaultDataRegister["username"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["username"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_50_boundary(self):
-        defaultDataRegister["username"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["username"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_51_boundary(self):
-        defaultDataRegister["username"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["username"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_letters_username(self):
-        defaultDataRegister["username"]="johnDoe"
+        defaultDataRegister["username"] = "johnDoe"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_num_username(self):
-        defaultDataRegister["username"]="23165484"
+        defaultDataRegister["username"] = "23165484"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_character_and_num_username(self):
-        defaultDataRegister["username"]="johnDoe7653"
+        defaultDataRegister["username"] = "johnDoe7653"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
@@ -244,148 +238,146 @@ class UsernameBoundaryTestCase(TestCase):
     def test_symbols(self):
         illegalCharacters = "!#¤%&/<>|§()=?`^*_:;,.-'¨\+@£$€{[]}´~` "
         for x in illegalCharacters:
-            defaultDataRegister["username"]=x +"johnDoe"
+            defaultDataRegister["username"] = x + "johnDoe"
             response = self.client.post("/api/users/", defaultDataRegister)
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
 
-
 class EmailBoundaryTestCase(TestCase):
     def setUp(self):
         # Adds some randomness
         global counter
-        defaultDataRegister["username"]= "johnDoe" + str(counter)
+        defaultDataRegister["username"] = "johnDoe" + str(counter)
         counter += 1
 
     @skip("Skip so pipeline will pass")
     def test_empty_email(self):
-        defaultDataRegister["email"]=""
+        defaultDataRegister["email"] = ""
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_4_boundary(self):
-        defaultDataRegister["email"]="kkkk"
+        defaultDataRegister["email"] = "kkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_5_boundary(self):
-        defaultDataRegister["email"]="kkkkk"
+        defaultDataRegister["email"] = "kkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_6_boundary(self):
-        defaultDataRegister["email"]="kkkkkk"
+        defaultDataRegister["email"] = "kkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_49_boundary(self):
-        defaultDataRegister["email"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["email"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_50_boundary(self):
-        defaultDataRegister["email"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["email"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_51_boundary(self):
-        defaultDataRegister["email"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["email"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_email(self):
-        defaultDataRegister["email"]="johnDoe@website.com"
+        defaultDataRegister["email"] = "johnDoe@website.com"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_invalid_email(self):
-        defaultDataRegister["email"]="johnDoe"
+        defaultDataRegister["email"] = "johnDoe"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_symbols(self):
-        #TODO: how to do this?
+        # TODO: how to do this?
         illegalCharacters = "!#¤%&/()=?`^*_:;,.-'¨\+@£$€{[]}´~`"
         for x in illegalCharacters:
-            defaultDataRegister["email"]=x
+            defaultDataRegister["email"] = x
             response = self.client.post("/api/users/", defaultDataRegister)
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
 
-
 class PasswordBoundaryTestCase(TestCase):
     def setUp(self):
         # Adds some randomness
         global counter
-        defaultDataRegister["username"]= "johnDoe" + str(counter)
+        defaultDataRegister["username"] = "johnDoe" + str(counter)
         counter += 1
 
     @skip("Skip so pipeline will pass")
     def test_empty_password(self):
-        defaultDataRegister["password"]=""
+        defaultDataRegister["password"] = ""
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_7_boundary(self):
-        defaultDataRegister["password"]="kkkkkkk"
+        defaultDataRegister["password"] = "kkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_8_boundary(self):
-        defaultDataRegister["password"]="kkkkkkkk"
+        defaultDataRegister["password"] = "kkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_9_boundary(self):
-        defaultDataRegister["password"]="kkkkkkkkk"
+        defaultDataRegister["password"] = "kkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_49_boundary(self):
-        defaultDataRegister["password"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["password"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_50_boundary(self):
-        defaultDataRegister["password"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["password"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_51_boundary(self):
-        defaultDataRegister["password"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["password"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_letters(self):
-        defaultDataRegister["password"]="passwordpassword"
+        defaultDataRegister["password"] = "passwordpassword"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_numbers(self):
-        defaultDataRegister["password"]="12315489798451216475"
+        defaultDataRegister["password"] = "12315489798451216475"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_symbols(self):
-        defaultDataRegister["password"]= "!#¤%&/<>|§()=?`^*_:;,.-'¨\+@£$€{[]}´~` "
+        defaultDataRegister["password"] = "!#¤%&/<>|§()=?`^*_:;,.-'¨\+@£$€{[]}´~` "
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
@@ -394,60 +386,60 @@ class PhoneBoundaryTestCase(TestCase):
     def setUp(self):
         # Adds some randomness
         global counter
-        defaultDataRegister["username"]= "johnDoe" + str(counter)
+        defaultDataRegister["username"] = "johnDoe" + str(counter)
         counter += 1
 
     @skip("Skip so pipeline will pass")
     def test_empty_phone(self):
-        defaultDataRegister["phone_number"]=""
+        defaultDataRegister["phone_number"] = ""
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_7_boundary(self):
-        defaultDataRegister["phone_number"]="1122334"
+        defaultDataRegister["phone_number"] = "1122334"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_8_boundary(self):
-        defaultDataRegister["phone_number"]="11223344"
+        defaultDataRegister["phone_number"] = "11223344"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_9_boundary(self):
-        defaultDataRegister["phone_number"]="112233445"
+        defaultDataRegister["phone_number"] = "112233445"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_19_boundary(self):
-        defaultDataRegister["phone_number"]="1122334455667788991"
+        defaultDataRegister["phone_number"] = "1122334455667788991"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_20_boundary(self):
-        defaultDataRegister["phone_number"]="11223344556677889911"
+        defaultDataRegister["phone_number"] = "11223344556677889911"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_11_boundary(self):
-        defaultDataRegister["phone_number"]="112233445566778899112"
+        defaultDataRegister["phone_number"] = "112233445566778899112"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_letters(self):
-        defaultDataRegister["phone_number"]="phoneNumber"
+        defaultDataRegister["phone_number"] = "phoneNumber"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_numbers(self):
-        defaultDataRegister["phone_number"]="004711223344"
+        defaultDataRegister["phone_number"] = "004711223344"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
@@ -455,7 +447,7 @@ class PhoneBoundaryTestCase(TestCase):
     def test_symbols(self):
         symbols = "!#¤%&/<>|§()=?`^*_:;,.-'¨\+@£$€{[]}´~` "
         for x in symbols:
-            defaultDataRegister["phone_number"]=x+"11223344"
+            defaultDataRegister["phone_number"] = x+"11223344"
             response = self.client.post("/api/users/", defaultDataRegister)
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
@@ -464,60 +456,60 @@ class CountryBoundaryTestCase(TestCase):
     def setUp(self):
         # Adds some randomness
         global counter
-        defaultDataRegister["username"]= "johnDoe" + str(counter)
+        defaultDataRegister["username"] = "johnDoe" + str(counter)
         counter += 1
 
     @skip("Skip so pipeline will pass")
     def test_empty_country(self):
-        defaultDataRegister["country"]=""
+        defaultDataRegister["country"] = ""
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_3_boundary(self):
-        defaultDataRegister["country"]="chi"
+        defaultDataRegister["country"] = "chi"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_4_boundary(self):
-        defaultDataRegister["country"]="Chad"
+        defaultDataRegister["country"] = "Chad"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_5_boundary(self):
-        defaultDataRegister["country"]="Italy"
+        defaultDataRegister["country"] = "Italy"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_49_boundary(self):
-        defaultDataRegister["country"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["country"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_50_boundary(self):
-        defaultDataRegister["country"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["country"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_51_boundary(self):
-        defaultDataRegister["country"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["country"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_letters(self):
-        defaultDataRegister["country"]="Norway"
+        defaultDataRegister["country"] = "Norway"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_numbers(self):
-        defaultDataRegister["country"]="Norway1"
+        defaultDataRegister["country"] = "Norway1"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
@@ -525,7 +517,7 @@ class CountryBoundaryTestCase(TestCase):
     def test_symbols(self):
         symbols = "!#¤%&/<>|§()=?`^*_:;,.-'¨\+@£$€{[]}´~` "
         for x in symbols:
-            defaultDataRegister["country"]=x+"Norway"
+            defaultDataRegister["country"] = x+"Norway"
             response = self.client.post("/api/users/", defaultDataRegister)
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
@@ -534,55 +526,54 @@ class CityBoundaryTestCase(TestCase):
     def setUp(self):
         # Adds some randomness
         global counter
-        defaultDataRegister["username"]= "johnDoe" + str(counter)
+        defaultDataRegister["username"] = "johnDoe" + str(counter)
         counter += 1
 
     @skip("Skip so pipeline will pass")
     def test_empty_city(self):
-        defaultDataRegister["city"]=""
+        defaultDataRegister["city"] = ""
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
-
     @skip("Skip so pipeline will pass")
     def test_1_boundary(self):
-        defaultDataRegister["city"]="A"
+        defaultDataRegister["city"] = "A"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_2_boundary(self):
-        defaultDataRegister["city"]="Li"
+        defaultDataRegister["city"] = "Li"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_49_boundary(self):
-        defaultDataRegister["city"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["city"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_50_boundary(self):
-        defaultDataRegister["city"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["city"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_51_boundary(self):
-        defaultDataRegister["city"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["city"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_letters(self):
-        defaultDataRegister["city"]="Oslo"
+        defaultDataRegister["city"] = "Oslo"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_numbers(self):
-        defaultDataRegister["city"]="Oslo1"
+        defaultDataRegister["city"] = "Oslo1"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
@@ -590,7 +581,7 @@ class CityBoundaryTestCase(TestCase):
     def test_symbols(self):
         symbols = "!#¤%&/<>|§()=?`^*_:;,.-'¨\+@£$€{[]}´~` "
         for x in symbols:
-            defaultDataRegister["city"]=x+"Oslo"
+            defaultDataRegister["city"] = x+"Oslo"
             response = self.client.post("/api/users/", defaultDataRegister)
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
@@ -599,61 +590,60 @@ class Street_AdressBoundaryTestCase(TestCase):
     def setUp(self):
         # Adds some randomness
         global counter
-        defaultDataRegister["username"]= "johnDoe" + str(counter)
+        defaultDataRegister["username"] = "johnDoe" + str(counter)
         counter += 1
 
     @skip("Skip so pipeline will pass")
     def test_empty_street_adress(self):
-        defaultDataRegister["street_adress"]=""
+        defaultDataRegister["street_adress"] = ""
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
-
     @skip("Skip so pipeline will pass")
     def test_1_boundary(self):
-        defaultDataRegister["street_adress"]="A"
+        defaultDataRegister["street_adress"] = "A"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_2_boundary(self):
-        defaultDataRegister["street_adress"]="Ta"
+        defaultDataRegister["street_adress"] = "Ta"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_49_boundary(self):
-        defaultDataRegister["street_adress"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["street_adress"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_50_boundary(self):
-        defaultDataRegister["street_adress"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["street_adress"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_51_boundary(self):
-        defaultDataRegister["street_adress"]="kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
+        defaultDataRegister["street_adress"] = "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     @skip("Skip so pipeline will pass")
     def test_letters(self):
-        defaultDataRegister["street_adress"]="Strandveien"
+        defaultDataRegister["street_adress"] = "Strandveien"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_numbers(self):
-        defaultDataRegister["street_adress"]="Strandveien1"
+        defaultDataRegister["street_adress"] = "Strandveien1"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
     @skip("Skip so pipeline will pass")
     def test_space(self):
-        defaultDataRegister["street_adress"]="Kongens gate"
+        defaultDataRegister["street_adress"] = "Kongens gate"
         response = self.client.post("/api/users/", defaultDataRegister)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
@@ -661,14 +651,11 @@ class Street_AdressBoundaryTestCase(TestCase):
     def test_symbols(self):
         symbols = "!#¤%&/<>|§()=?`^*_:;,.-'¨\+@£$€{[]}´~`"
         for x in symbols:
-            defaultDataRegister["city"]=x+"Strandveien"
+            defaultDataRegister["city"] = x+"Strandveien"
             response = self.client.post("/api/users/", defaultDataRegister)
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
 
-
-
-
 '''
     2-way domain testing
 
@@ -679,15 +666,23 @@ class Street_AdressBoundaryTestCase(TestCase):
 '''
 
 twoWayDomainData = [
-[("username", "", False), ("username", "johny", True), ("username", "johnDoe7653", True), ("username", "23165484", True), ("username", "John!#¤%&/<>|§()=?`^*_:;", False) ],
-[("email", "", False), ("email", "kkkk", False), ("email", "johnDoe@webmail.com", True), ("email", "johnDoe@web#%¤&/&.com", False)],
-[("password", "", False), ("password","short", False), ("password","passwordpassword", True), ("password","123346)(%y#(%¨>l<][475", True)],
-[("phone_number","", False), ("phone_number","1234", False), ("phone_number","1122334455", True), ("phone_number","phonenumber", False), ("phone_number","=?`^*_:;,.-'¨\+@£$", False)],
-[("country","", False), ("country", "Chad", True), ("country", "Norway1", False), ("country", "=?`^*_:;,.-'¨\+@£$", False)],
-[("city","", False), ("city", "Oslo", True), ("city", "Oslo1", False), ("city", "Oslo=?`^*_:;,.-'¨\+@£$", False)],
-[("street_adress","", False), ("street_adress", "Strandveien", True), ("street_adress", "Strandveien1", True), ("street_adress", "Kongens gate", True), ("street_adress", "Oslo=?`^*_:;,.-'¨\+@£$", False)]]
+    [("username", "", False), ("username", "johny", True), ("username", "johnDoe7653", True),
+     ("username", "23165484", True), ("username", "John!#¤%&/<>|§()=?`^*_:;", False)],
+    [("email", "", False), ("email", "kkkk", False), ("email",
+                                                      "johnDoe@webmail.com", True), ("email", "johnDoe@web#%¤&/&.com", False)],
+    [("password", "", False), ("password", "short", False), ("password",
+                                                             "passwordpassword", True), ("password", "123346)(%y#(%¨>l<][475", True)],
+    [("phone_number", "", False), ("phone_number", "1234", False), ("phone_number", "1122334455",
+                                                                    True), ("phone_number", "phonenumber", False), ("phone_number", "=?`^*_:;,.-'¨\+@£$", False)],
+    [("country", "", False), ("country", "Chad", True), ("country",
+                                                         "Norway1", False), ("country", "=?`^*_:;,.-'¨\+@£$", False)],
+    [("city", "", False), ("city", "Oslo", True),
+     ("city", "Oslo1", False), ("city", "Oslo=?`^*_:;,.-'¨\+@£$", False)],
+    [("street_adress", "", False), ("street_adress", "Strandveien", True), ("street_adress", "Strandveien1", True), ("street_adress", "Kongens gate", True), ("street_adress", "Oslo=?`^*_:;,.-'¨\+@£$", False)]]
+
+two_way_passwords = [['johnsPassword', 'johnsPassword'], [
+    'johnsPassword', 'johnsPassword1'], ['', 'johnsPassword'], ['johnsPassword', '']]
 
-two_way_passwords = [['johnsPassword', 'johnsPassword'], ['johnsPassword', 'johnsPassword1'], ['', 'johnsPassword'], ['johnsPassword', '']]
 
 class two_way_domain_test(TestCase):
     def setUp(self):
@@ -705,7 +700,7 @@ class two_way_domain_test(TestCase):
 
         # Set data
         self.defaultDataRegister = {
-        "username": "johnDoe"+str(counter), "email": "johnDoe@webserver.com", "password": "johnsPassword", "password1": "johnsPassword",  "phone_number": "11223344", "country": "Norway", "city": "Trondheim", "street_address": "Kongens gate 33"}
+            "username": "johnDoe"+str(counter), "email": "johnDoe@webserver.com", "password": "johnsPassword", "password1": "johnsPassword",  "phone_number": "11223344", "country": "Norway", "city": "Trondheim", "street_address": "Kongens gate 33"}
         self.defaultDataRegister[value1[0]] = value1[1]
         self.defaultDataRegister[value2[0]] = value2[1]
 
@@ -717,72 +712,81 @@ class two_way_domain_test(TestCase):
 
         # Get result
         response = self.client.post("/api/users/", self.defaultDataRegister)
-    
+
         # If the result should be 201
         if value1[2] and value2[2]:
             if response.status_code != status.HTTP_201_CREATED:
-                self.failures_201.append({"type1": value1[0], "value1":value1[1], "type2":value2[0], "value2":value2[1]})
-                self.failedCounter +=1
-        
+                self.failures_201.append(
+                    {"type1": value1[0], "value1": value1[1], "type2": value2[0], "value2": value2[1]})
+                self.failedCounter += 1
+
         # If the result should be 400
         else:
             if response.status_code != status.HTTP_400_BAD_REQUEST:
-                self.failures_400.append({"type1": value1[0], "value1":value1[1], "type2":value2[0], "value2":value2[1]})
-                self.failedCounter +=1
-      
+                self.failures_400.append(
+                    {"type1": value1[0], "value1": value1[1], "type2": value2[0], "value2": value2[1]})
+                self.failedCounter += 1
+
         # Delete the created user to prevent errors when we test the same value of username several times
         if response.status_code == status.HTTP_201_CREATED:
             # Authenticate so we can delete
-            self.client.force_authenticate(user=User.objects.get(id = response.data['id']))
-            response2 = self.client.delete('/api/users/'+str(response.data['id'])+'/')
-
+            self.client.force_authenticate(
+                user=User.objects.get(id=response.data['id']))
+            response2 = self.client.delete(
+                '/api/users/'+str(response.data['id'])+'/')
 
     def two_way_password(self):
         global counter
         counter += 1
         self.defaultDataRegister = {
-        "username": "johnDoe"+str(counter), "email": "johnDoe@webserver.com", "password": "johnsPassword", "password1": "johnsPassword",  "phone_number": "11223344", "country": "Norway", "city": "Trondheim", "street_address": "Kongens gate 33"}
+            "username": "johnDoe"+str(counter), "email": "johnDoe@webserver.com", "password": "johnsPassword", "password1": "johnsPassword",  "phone_number": "11223344", "country": "Norway", "city": "Trondheim", "street_address": "Kongens gate 33"}
 
         for passwords in two_way_passwords:
             self.defaultDataRegister['password'] = passwords[0]
             self.defaultDataRegister['password1'] = passwords[1]
             self.testsRunned += 1
             # Get result
-            response = self.client.post("/api/users/", self.defaultDataRegister)
-        
+            response = self.client.post(
+                "/api/users/", self.defaultDataRegister)
+
             # Check
             if passwords[0] is passwords[1]:
                 if response.status_code != status.HTTP_201_CREATED:
-                    self.failures_201.append({"type1": 'password', "value1":passwords[0], "type2": 'password1', "value2":passwords[1]})
-                    self.failedCounter +=1
+                    self.failures_201.append(
+                        {"type1": 'password', "value1": passwords[0], "type2": 'password1', "value2": passwords[1]})
+                    self.failedCounter += 1
             else:
                 if response.status_code != status.HTTP_400_BAD_REQUEST:
-                    self.failures_400.append({"type1": 'password', "value1":passwords[0], "type2": 'password1', "value2":passwords[1]})
-                    self.failedCounter +=1
+                    self.failures_400.append(
+                        {"type1": 'password', "value1": passwords[0], "type2": 'password1', "value2": passwords[1]})
+                    self.failedCounter += 1
 
             # Delete the created user to prevent errors when we test the same value of username several times
             if response.status_code == status.HTTP_201_CREATED:
                 # Authenticate so we can delete
-                self.client.force_authenticate(user=User.objects.get(id = response.data['id']))
-                response2 = self.client.delete('/api/users/'+str(response.data['id'])+'/')
-
+                self.client.force_authenticate(
+                    user=User.objects.get(id=response.data['id']))
+                response2 = self.client.delete(
+                    '/api/users/'+str(response.data['id'])+'/')
 
     def test_two_way_domain(self):
-        # For each element, try all other elements once     
+        # For each element, try all other elements once
         for y1 in range(0, len(twoWayDomainData)):
             for x1 in range(0, len(twoWayDomainData[y1])):
                 for y2 in range(y1+1, len(twoWayDomainData)):
                     for x2 in range(0, len(twoWayDomainData[y2])):
-                        self.check(twoWayDomainData[y1][x1], twoWayDomainData[y2][x2])
-        
+                        self.check(
+                            twoWayDomainData[y1][x1], twoWayDomainData[y2][x2])
+
         # Do two way testing for passwords
         self.two_way_password()
 
-
         # Print results
         print("\n-------------------------------------------------------------------------------------------------------------------------------")
-        print("2-Way Domain Testing:\nTotal combinations (tests): {}\nTotal failed combinations (tests): {}".format(self.testsRunned, self.failedCounter))
-        print("{} combinations should work but didn't\n{} combinations should NOT work but did".format(len(self.failures_201), len(self.failures_400)))
-        print("The combinations that should have worked: {}\nThe combinations that should not have worked: {}".format(self.failures_201, self.failures_400))
+        print("2-Way Domain Testing:\nTotal combinations (tests): {}\nTotal failed combinations (tests): {}".format(
+            self.testsRunned, self.failedCounter))
+        print("{} combinations should work but didn't\n{} combinations should NOT work but did".format(
+            len(self.failures_201), len(self.failures_400)))
+        print("The combinations that should have worked: {}\nThe combinations that should not have worked: {}".format(
+            self.failures_201, self.failures_400))
         print("-------------------------------------------------------------------------------------------------------------------------------")
-