diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index f7f483acb97228b6a5231f492172bfd49632aac7..0000000000000000000000000000000000000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/core/migrations/0020_merge_20191006_2032.py b/core/migrations/0020_merge_20191006_2032.py
new file mode 100644
index 0000000000000000000000000000000000000000..b6abf8d4c8c61815efa05486dfcc48ff0e3bbc02
--- /dev/null
+++ b/core/migrations/0020_merge_20191006_2032.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2019-10-06 13:32
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0017_vacancy_amount'),
+        ('core', '0019_merge_20191006_0852'),
+        ('core', '0014_auto_20191004_1340'),
+    ]
+
+    operations = [
+    ]
diff --git a/core/tests/test_vacancies.py b/core/tests/test_vacancies.py
index 70bcc648c8fc7cdb7abed912cff15eec118d0ce6..d0d5d9e186aaedcfab65fd885691633ae8f58fe9 100644
--- a/core/tests/test_vacancies.py
+++ b/core/tests/test_vacancies.py
@@ -179,25 +179,34 @@ class VacancyTest(APITestCase):
     def test_filter_vacancy_list_by_company_ids(self):
         superuser = User.objects.create_superuser('dummy.company', 'dummy.company@company.com', 'lalala123')
         self.client.force_authenticate(user=superuser)
+        url_no_companies='/api/vacancies/'
         
+        response = self.client.get(url_no_companies, format='json')
+        self.assertEqual(dict(response.data)['count'], Vacancy.objects.count())
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
         new_user = User.objects.create_user('dummy.company3', 'dummy.company3@company.com', 'lalala123')
         new_company = Company.objects.create(user=new_user, description="lalala", status=Company.VERIFIED, logo=None,
                                              address=None)
+        
+        url_a_company = '/api/vacancies/?company={}'.format(new_company.id)
+        response = self.client.get(url_a_company, format='json')
+        self.assertEqual(dict(response.data)['count'], 0)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-        new_user2 = User.objects.create_user('dummy.companyzxc', 'dummy.companyzxc@company.com', 'lalala123')
-        new_company2 = Company.objects.create(user=new_user2, description="lalalaasdsad", status=Company.VERIFIED,
-                                              logo=None,
-                                              address=None)
         open_time = datetime(2019, 10, 20)
         close_time = datetime(2019, 12, 20)
         vacancy1 = Vacancy.objects.create(company=new_company, verified=True, open_time=open_time, 
                                             description='', close_time=close_time, name='vacancy1')
-        vacancy2 = Vacancy.objects.create(company=new_company2, verified=True, open_time=open_time, 
-                                            description='', close_time=close_time, name='vacancy2')
-        url = '/api/vacancies/?company={}&company={}'.format(new_company.id, new_company2.id)
-        response = self.client.get(url, format='json')
-        vacancies = Vacancy.objects.filter(company__id__in=[new_company.id, new_company2.id])
-        self.assertEqual(dict(response.data)['count'], Vacancy.objects.count())
+        
+        response = self.client.get(url_a_company, format='json')
+        vacancies = Vacancy.objects.filter(company__id__in=[new_company.id])
+        self.assertEqual(dict(response.data)['count'], 1)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        url_not_exist_company = '/api/vacancies/?company={}'.format(0)
+        response = self.client.get(url_not_exist_company, format='json')
+        self.assertEqual(dict(response.data)['count'], 0)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
 
diff --git a/provision/.DS_Store b/provision/.DS_Store
deleted file mode 100644
index 61d1f2da3985a90f5832911c6e4158fa5e0cfcb3..0000000000000000000000000000000000000000
Binary files a/provision/.DS_Store and /dev/null differ
diff --git a/provision/nginx/.DS_Store b/provision/nginx/.DS_Store
deleted file mode 100644
index d5d5bf94962214228bf6af09b5185b6d6d050d02..0000000000000000000000000000000000000000
Binary files a/provision/nginx/.DS_Store and /dev/null differ