diff --git a/ingestion_server/test/unit_test.py b/ingestion_server/test/unit_test.py
index db58ca0ba..16b2bc930 100644
--- a/ingestion_server/test/unit_test.py
+++ b/ingestion_server/test/unit_test.py
@@ -1,9 +1,10 @@
 import datetime
+from unittest.mock import MagicMock
 from uuid import uuid4
 
 from psycopg2.extras import Json
 
-from ingestion_server.cleanup import CleanupFunctions
+from ingestion_server.cleanup import CleanupFunctions, TlsTest
 from ingestion_server.elasticsearch_models import Image
 
 
@@ -141,6 +142,7 @@ def test_url_protocol_fix():
         expected = "'https://flickr.com'"
 
         bad_http = "neverssl.com"
+        TlsTest.test_tls_supported = MagicMock(return_value=False)
         result_http = CleanupFunctions.cleanup_url(bad_http, tls_support_cache)
         expected_http = "'http://neverssl.com'"
         assert result == expected
diff --git a/openverse_api/catalog/api/migrations/0001_initial.py b/openverse_api/catalog/api/migrations/0001_initial.py
index 501e18904..983a65058 100644
--- a/openverse_api/catalog/api/migrations/0001_initial.py
+++ b/openverse_api/catalog/api/migrations/0001_initial.py
@@ -53,7 +53,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('created_on', models.DateTimeField(auto_now_add=True)),
                 ('updated_on', models.DateTimeField(auto_now=True)),
-                ('id', models.IntegerField(primary_key=True, serialize=False)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('title', models.CharField(help_text='Display name', max_length=2000)),
                 ('images', models.ManyToManyField(help_text='A list of primary keys corresponding to images.', related_name='lists', to='api.Image')),
             ],
diff --git a/openverse_api/catalog/api/migrations/0002_auto_20180723_1737.py b/openverse_api/catalog/api/migrations/0002_auto_20180723_1737.py
deleted file mode 100644
index 8f6a3e5c9..000000000
--- a/openverse_api/catalog/api/migrations/0002_auto_20180723_1737.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.5 on 2018-07-23 17:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='imagelist',
-            name='id',
-            field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-        ),
-    ]
diff --git a/openverse_api/catalog/api/migrations/0003_image_view_count.py b/openverse_api/catalog/api/migrations/0003_image_view_count.py
index c4afaa8d1..67272798d 100644
--- a/openverse_api/catalog/api/migrations/0003_image_view_count.py
+++ b/openverse_api/catalog/api/migrations/0003_image_view_count.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0002_auto_20180723_1737'),
+        ('api', '0001_initial'),  # 0002 was merged into 0001 to protect FK constraint
     ]
 
     operations = [