diff --git a/src/NzbDrone.Core.Test/MetadataSource/BookInfo/BookInfoProxySearchFixture.cs b/src/NzbDrone.Core.Test/MetadataSource/BookInfo/BookInfoProxySearchFixture.cs
index 06fdb4790..fbbf69b5b 100644
--- a/src/NzbDrone.Core.Test/MetadataSource/BookInfo/BookInfoProxySearchFixture.cs
+++ b/src/NzbDrone.Core.Test/MetadataSource/BookInfo/BookInfoProxySearchFixture.cs
@@ -6,7 +6,6 @@ using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.Http;
-using NzbDrone.Core.MetadataSource;
 using NzbDrone.Core.MetadataSource.BookInfo;
 using NzbDrone.Core.MetadataSource.Goodreads;
 using NzbDrone.Core.Profiles.Metadata;
@@ -86,9 +85,9 @@ namespace NzbDrone.Core.Test.MetadataSource.Goodreads
             ExceptionVerification.IgnoreWarns();
         }
 
-        [TestCase("Philip Pullman", 0, typeof(Author), "Philip Pullman")]
-        [TestCase("Philip Pullman", 1, typeof(Book), "The Amber Spyglass")]
-        public void successful_combined_search(string query, int position, Type resultType, string expected)
+        [TestCase("Philip Pullman", 0, typeof(Author), new[] { "Philip Pullman" }, TestName = "author")]
+        [TestCase("Philip Pullman", 1, typeof(Book), new[] { "Northern Lights", "The Amber Spyglass" }, TestName = "book")]
+        public void successful_combined_search(string query, int position, Type resultType, string[] expected)
         {
             var result = Subject.SearchForNewEntity(query);
             result.Should().NotBeEmpty();
@@ -98,13 +97,13 @@ namespace NzbDrone.Core.Test.MetadataSource.Goodreads
             {
                 var cast = result[position] as Author;
                 cast.Should().NotBeNull();
-                cast.Name.Should().Be(expected);
+                cast.Name.Should().ContainAll(expected);
             }
             else
             {
                 var cast = result[position] as Book;
                 cast.Should().NotBeNull();
-                cast.Title.Should().Be(expected);
+                cast.Title.Should().ContainAny(expected);
             }
         }
     }
diff --git a/src/NzbDrone.Integration.Test/IntegrationTest.cs b/src/NzbDrone.Integration.Test/IntegrationTest.cs
index 19a98963f..a4446fc58 100644
--- a/src/NzbDrone.Integration.Test/IntegrationTest.cs
+++ b/src/NzbDrone.Integration.Test/IntegrationTest.cs
@@ -84,12 +84,14 @@ namespace NzbDrone.Integration.Test
         {
             PostgresDatabase.Create(options, MigrationType.Main);
             PostgresDatabase.Create(options, MigrationType.Log);
+            PostgresDatabase.Create(options, MigrationType.Cache);
         }
 
         private static void DropPostgresDb(PostgresOptions options)
         {
             PostgresDatabase.Drop(options, MigrationType.Main);
             PostgresDatabase.Drop(options, MigrationType.Log);
+            PostgresDatabase.Drop(options, MigrationType.Cache);
         }
     }
 }
diff --git a/src/NzbDrone.Test.Common/Datastore/PostgresDatabase.cs b/src/NzbDrone.Test.Common/Datastore/PostgresDatabase.cs
index 940334ca2..559c242ed 100644
--- a/src/NzbDrone.Test.Common/Datastore/PostgresDatabase.cs
+++ b/src/NzbDrone.Test.Common/Datastore/PostgresDatabase.cs
@@ -14,6 +14,7 @@ namespace NzbDrone.Test.Common.Datastore
             var uid = TestBase.GetUID();
             options.MainDb = uid + "_main";
             options.LogDb = uid + "_log";
+            options.CacheDb = uid + "_cache";
 
             return options;
         }
@@ -62,6 +63,7 @@ namespace NzbDrone.Test.Common.Datastore
             {
                 MigrationType.Main => options.MainDb,
                 MigrationType.Log => options.LogDb,
+                MigrationType.Cache => options.CacheDb,
                 _ => throw new NotImplementedException("Unknown migration type")
             };
         }