Refactor test fixtures and update search item kind checks for consistency

Author: kevbite

src/CompaniesHouse/JsonConverters/SearchItemConverter.cs

@@ -13,15 +13,15 @@ public class SearchItemConverter : JsonCreationConverter<SearchItem>
         protected override SearchItem Create(Type objectType, JObject jObject)
         {
             var kind = jObject.Value<string>("kind");
-            if (kind == "searchresults#company")
+            if (kind is "searchresults#company" or "search-results#company")
             {
                 return new Company();
             }
-            else if (kind == "searchresults#officer")
+            else if (kind is "searchresults#officer")
             {
                 return new Officer();
             }
-            else if (kind == "searchresults#disqualified-officer")
+            else if (kind is "searchresults#disqualified-officer")
             {
                 return new DisqualifiedOfficer();
             }

tests/CompaniesHouse.IntegrationTests/Tests/SearchingTests/CompanySearchAdvancedTests.cs

@@ -6,7 +6,7 @@
 
 namespace CompaniesHouse.IntegrationTests.Tests.SearchingTests
 {
-    [TestFixture("brighouse computers")]
+    [TestFixture("brighouse")]
     [TestFixture("British Gas")]
     [TestFixture("Bay Horse")]
     public class CompanySearchAdvancedTests

tests/CompaniesHouse.IntegrationTests/Tests/SearchingTests/CompanySearchTests.cs

@@ -9,7 +9,6 @@ namespace CompaniesHouse.IntegrationTests.Tests.SearchingTests
     [TestFixture("brighouse computers")]
     [TestFixture("British Gas")]
     [TestFixture("Bay Horse")]
-
     public class CompanySearchTests
     {
         private readonly string _query;