diff --git a/facets.module b/facets.module
index 6c04f21..e26500d 100644
--- a/facets.module
+++ b/facets.module
@@ -265,10 +265,7 @@ function facets_system_breadcrumb_alter(Breadcrumb &$breadcrumb, RouteMatchInter
 
     // Sort facets by weight.
     uasort($facets, function (FacetInterface $a, FacetInterface $b) {
-      if ($a->getWeight() == $b->getWeight()) {
-        return 0;
-      }
-      return ($a->getWeight() < $b->getWeight()) ? -1 : 1;
+      return (int) $a->getWeight() - $b->getWeight();
     });
 
     /** @var \Drupal\facets\UrlProcessor\UrlProcessorPluginManager $url_processor_manager */
diff --git a/modules/facets_range_widget/src/Plugin/facets/processor/SliderProcessor.php b/modules/facets_range_widget/src/Plugin/facets/processor/SliderProcessor.php
index 1f8b7f0..2d71213 100644
--- a/modules/facets_range_widget/src/Plugin/facets/processor/SliderProcessor.php
+++ b/modules/facets_range_widget/src/Plugin/facets/processor/SliderProcessor.php
@@ -37,10 +37,7 @@ class SliderProcessor extends ProcessorPluginBase implements PostQueryProcessorI
       ];
     }
     uasort($simple_results, function ($a, $b) {
-      if ($a['value'] === $b['value']) {
-        return 0;
-      }
-      return $a['value'] < $b['value'] ? -1 : 1;
+      return (int) $a['value'] - $b['value'];
     });
 
     $step = $config['step'];
diff --git a/modules/facets_rest/src/Plugin/views/style/FacetsSerializer.php b/modules/facets_rest/src/Plugin/views/style/FacetsSerializer.php
index ffbec25..a6c4eb4 100644
--- a/modules/facets_rest/src/Plugin/views/style/FacetsSerializer.php
+++ b/modules/facets_rest/src/Plugin/views/style/FacetsSerializer.php
@@ -120,7 +120,7 @@ class FacetsSerializer extends Serializer {
       );
     }
     uasort($facets_metadata, function($a, $b) {
-      return $a['weight'] > $b['weight'];
+      return (int) $a['weight'] - $b['weight'];
     });
 
     $rows['facets'] = array_values($processed_facets);
diff --git a/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php b/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php
index c302a4c..2a8027c 100644
--- a/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php
+++ b/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php
@@ -304,7 +304,7 @@ class RestIntegrationTest extends FacetsTestBase {
       $this->assertEquals($results[$value]['count'], $result->values->count);
       $this->assertSame($results[$value]['raw_value'], $result->raw_value);
       foreach ($results[$value]['url'] as $url_part) {
-        $this->assertContains($url_part, $result->url);
+        $this->assertStringContainsString($url_part, $result->url);
       }
     }
 
@@ -313,7 +313,7 @@ class RestIntegrationTest extends FacetsTestBase {
       $this->assertEquals($results[$value]['count'], $result->values->count);
       $this->assertSame($results[$value]['raw_value'], $result->raw_value);
       foreach ($results[$value]['url'] as $url_part) {
-        $this->assertContains($url_part, $result->url);
+        $this->assertStringContainsString($url_part, $result->url);
       }
     }
   }
diff --git a/tests/src/Functional/BreadcrumbIntegrationTest.php b/tests/src/Functional/BreadcrumbIntegrationTest.php
index 28bb307..501cd54 100644
--- a/tests/src/Functional/BreadcrumbIntegrationTest.php
+++ b/tests/src/Functional/BreadcrumbIntegrationTest.php
@@ -167,7 +167,10 @@ class BreadcrumbIntegrationTest extends FacetsTestBase {
 
     // Check that the current url still has the initial parameters.
     $curr_url = UrlHelper::parse($this->getUrl());
-    $this->assertArraySubset($initial_query, $curr_url['query']);
+    foreach ($initial_query as $key => $value) {
+      $this->assertArrayHasKey($key, $curr_url['query']);
+      $this->assertEquals($value, $curr_url['query'][$key]);
+    }
   }
 
 }