diff --git a/core/tests/unit/views/test_ofm_stadium_detail_view.py b/core/tests/unit/views/test_ofm_stadium_detail_view.py
index 0f09069..ce52117 100644
--- a/core/tests/unit/views/test_ofm_stadium_detail_view.py
+++ b/core/tests/unit/views/test_ofm_stadium_detail_view.py
@@ -7,28 +7,28 @@
 
 class OFMStadiumDetailsViewTestCase(TestCase):
     def setUp(self):
-        self.matchday = MatchdayFactory.create()
-        self.second_matchday = MatchdayFactory.create(number=1)
-        self.user1 = OFMUser.objects.create_user(
+        MatchdayFactory.create()
+        MatchdayFactory.create(number=1)
+        user1 = OFMUser.objects.create_user(
             username='alice',
             email='alice@ofmhelper.com',
             password='alice',
             ofm_username='alice',
             ofm_password='alice'
         )
-        self.user2 = OFMUser.objects.create_user(
+        OFMUser.objects.create_user(
             username='bob',
             email='bob@ofmhelper.com',
             password='bob',
             ofm_username='bob',
             ofm_password='bob'
         )
-        self.match = MatchFactory.create(user=self.user1)
-        self.stadium_stat = MatchStadiumStatisticsFactory.create(match=self.match)
-        self.north_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
-        self.south_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
-        self.west_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
-        self.east_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
+        match = MatchFactory.create(user=user1)
+        self.stadium_stat = MatchStadiumStatisticsFactory.create(match=match)
+        StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
+        StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
+        StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
+        StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
         self.client.login(username='alice', password='alice')
 
     def test_user_can_see_his_data(self):
diff --git a/core/tests/unit/views/test_ofm_stadium_stand_statistics_view.py b/core/tests/unit/views/test_ofm_stadium_stand_statistics_view.py
index ccd70bc..7a899fb 100644
--- a/core/tests/unit/views/test_ofm_stadium_stand_statistics_view.py
+++ b/core/tests/unit/views/test_ofm_stadium_stand_statistics_view.py
@@ -10,27 +10,27 @@
 
 class OFMStadiumStandStatisticsViewTestCase(TestCase):
     def setUp(self):
-        self.matchday = MatchdayFactory.create()
-        self.user1 = OFMUser.objects.create_user(
+        MatchdayFactory.create()
+        user1 = OFMUser.objects.create_user(
             username='alice',
             email='alice@ofmhelper.com',
             password='alice',
             ofm_username='alice',
             ofm_password='alice'
         )
-        self.user2 = OFMUser.objects.create_user(
+        OFMUser.objects.create_user(
             username='bob',
             email='bob@ofmhelper.com',
             password='bob',
             ofm_username='bob',
             ofm_password='bob'
         )
-        self.match = MatchFactory.create(user=self.user1)
-        self.stadium_stat = MatchStadiumStatisticsFactory.create(match=self.match)
-        self.north_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
-        self.south_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
-        self.west_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
-        self.east_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
+        match = MatchFactory.create(user=user1)
+        stadium_stat = MatchStadiumStatisticsFactory.create(match=match)
+        StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat, sector='N')
+        StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat, sector='S')
+        StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat, sector='W')
+        StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat, sector='O')
         self.client.login(username='alice', password='alice')
 
     def test_user_can_see_his_data(self):
diff --git a/core/tests/unit/views/test_ofm_stadium_statistics_view.py b/core/tests/unit/views/test_ofm_stadium_statistics_view.py
index 2ee1df2..c24edf8 100644
--- a/core/tests/unit/views/test_ofm_stadium_statistics_view.py
+++ b/core/tests/unit/views/test_ofm_stadium_statistics_view.py
@@ -18,10 +18,10 @@ def setUp(self):
         self.match = MatchFactory.create(user=self.user)
 
         self.stadium_stat = MatchStadiumStatisticsFactory.create(match=self.match)
-        self.north_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
-        self.south_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
-        self.west_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
-        self.east_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
+        StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
+        StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
+        StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
+        StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
 
     def test_user_can_see_table(self):
         response = self.client.get(reverse('core:ofm:stadium_statistics_overview'))
@@ -154,10 +154,10 @@ def test_user_can_filter_for_stadium_configuration(self):
         light_level = StadiumLevelItemFactory(current_level=1)
         level = StadiumLevelFactory.create(light=light_level)
         stadium_stat_2 = MatchStadiumStatisticsFactory.create(match=match2, level=level)
-        self.north_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='N')
-        self.south_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='S')
-        self.west_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='W')
-        self.east_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='O')
+        StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='N')
+        StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='S')
+        StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='W')
+        StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='O')
 
         options = {
             'harmonic_strength': 50,