diff --git a/main/migrations/0018_alter_unassignedticket_ticket_id.py b/main/migrations/0018_alter_unassignedticket_ticket_id.py
new file mode 100644
index 0000000..7899c3c
--- /dev/null
+++ b/main/migrations/0018_alter_unassignedticket_ticket_id.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.3 on 2021-05-20 17:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0017_auto_20210408_1943'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='unassignedticket',
+            name='ticket_id',
+            field=models.IntegerField(help_text='Номер тикета, для которого сняли ответственного'),
+        ),
+    ]
diff --git a/main/tests.py b/main/tests.py
index 5365782..7946c01 100644
--- a/main/tests.py
+++ b/main/tests.py
@@ -30,11 +30,11 @@ class UsersBaseTestCase(TestCase):
         self.admin = 'admin@gmail.com'
         self.engineer = 'customer@example.com'
         self.agent_client = Client()
-        self.agent_client.force_login(User.objects.get(email=self.light_agent))
+        self.agent_client.force_login(get_user_model().objects.get(email=self.light_agent))
         self.admin_client = Client()
-        self.admin_client.force_login(User.objects.get(email=self.admin))
+        self.admin_client.force_login(get_user_model().objects.get(email=self.admin))
         self.engineer_client = Client()
-        self.engineer_client.force_login(User.objects.get(email=self.engineer))
+        self.engineer_client.force_login(get_user_model().objects.get(email=self.engineer))
 
 
 class RegistrationTestCase(TestCase):
@@ -252,7 +252,10 @@ class MakeLightAgentTestCase(UsersBaseTestCase):
     def test_control_page_make_light_agent_one(self, zenpy_mock, _user_tickets_mock):
         self.admin_client.post(
             reverse_lazy('control'),
-            data={'users': [get_user_model().objects.get(email=self.engineer).userprofile.id], 'light_agent': 'light_agent'}
+            data={
+                'users': [get_user_model().objects.get(email=self.engineer).userprofile.id],
+                'light_agent': 'light_agent'
+            }
         )
         call_list = zenpy_mock.update_user.call_args_list
         mock_object = call_list[0][0][0]
@@ -330,7 +333,12 @@ class PasswordResetTestCase(UsersBaseTestCase):
         Функция корректности отработки неверно введенного email.
         """
         with self.settings(EMAIL_BACKEND=self.email_backend):
-            resp = self.agent_client.post(reverse_lazy('password_reset'), data={'email': self.light_agent + str(random.random())})
+            resp = self.agent_client.post(
+                reverse_lazy('password_reset'),
+                data={
+                    'email': self.light_agent + str(random.random())
+                }
+            )
         self.assertRedirects(resp, reverse('password_reset_done'))
         self.assertEqual(resp.status_code, 302)
         self.assertEqual(len(mail.outbox), 0)
@@ -503,11 +511,11 @@ class GetTicketsTestCase(UsersBaseTestCase):
 
     @patch('main.views.zenpy')
     @patch('main.views.get_tickets_list_for_group')
-    def test_take_zero_tickets(self, TicketsMock, zenpy_mock):
+    def test_take_zero_tickets(self, tickets_mock, zenpy_mock):
         """
         Функция проверки попытки назначения нуля тикета на engineer.
         """
-        TicketsMock.return_value = [Mock()] * 3
+        tickets_mock.return_value = [Mock()] * 3
         zenpy_mock.get_user.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['engineer'])
         self.engineer_client.post(reverse('work_get_tickets'), data={'count_tickets': 0})
         tickets = zenpy_mock.update_tickets.call_args[0][0]
@@ -596,9 +604,8 @@ class LoggingTestCase(UsersBaseTestCase):
 
     @staticmethod
     def get_file_output():
-        file = open('logs/logs.csv', 'r')
-        file_output = file.readlines()[-1]
-        file.close()
+        with open('logs/logs.csv', 'r') as file:
+            file_output = file.readlines()[-1]
         return file_output
 
     def test_engineer_with_admin(self):