diff --git a/Tests/InstantSearchCoreTests/Unit/DynamicFacets/BuildOrderTests.swift b/Tests/InstantSearchCoreTests/Unit/DynamicFacets/BuildOrderTests.swift
deleted file mode 100644
index 5e56aa02..00000000
--- a/Tests/InstantSearchCoreTests/Unit/DynamicFacets/BuildOrderTests.swift
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-//  BuildOrderTests.swift
-//  
-//
-//  Created by Vladislav Fitc on 14/04/2021.
-//
-
-import Foundation
-@testable import InstantSearchCore
-import XCTest
-
-class BuildOrderTests: XCTestCase {
-  
-  let facets: [Attribute: [Facet]] = [
-      "size": [
-        Facet(value: "XS", count: 82),
-        Facet(value: "L", count: 81),
-        Facet(value: "XXXL", count: 73),
-        Facet(value: "XXL", count: 71),
-        Facet(value: "M", count: 67),
-        Facet(value: "S", count: 67),
-        Facet(value: "XL", count: 67),
-      ],
-      "brand": [
-        Facet(value: "Dyson", count: 53),
-        Facet(value: "Sony", count: 53),
-        Facet(value: "Apple", count: 51),
-        Facet(value: "Uniqlo", count: 43),
-      ],
-      "color": [
-        Facet(value: "yellow", count: 65),
-        Facet(value: "blue", count: 63),
-        Facet(value: "red", count: 58),
-        Facet(value: "violet", count: 55),
-        Facet(value: "orange", count: 54),
-        Facet(value: "green", count: 48),
-      ],
-      "country": [
-        Facet(value: "Spain", count: 31),
-        Facet(value: "Finland", count: 27),
-        Facet(value: "Germany", count: 27),
-        Facet(value: "UK", count: 26),
-        Facet(value: "Italy", count: 25),
-        Facet(value: "France", count: 23),
-        Facet(value: "Denmark", count: 22),
-        Facet(value: "USA", count: 19),
-      ]
-  ]
-  
-  func withOrder(_ facetOrder: FacetOrdering) -> [AttributedFacets] {
-    return FacetsOrderer(facetOrder: facetOrder, facets: facets)()
-  }
-
-  func testStrictFacetsOrder() {
-    let facets = ["size", "brand", "color", "country"].shuffled()
-    let order = FacetOrdering(facets: FacetValuesOrder(order: facets, hide: nil, sortBy: nil), facetValues: [:])
-    XCTAssertEqual(withOrder(order).map(\.attribute.rawValue), facets)
-  }
-  
-  func testPartialFacetsOrder() {
-    let facets = ["size", "country"]
-    let order = FacetOrdering(facets: FacetValuesOrder(order: facets, hide: nil, sortBy: nil), facetValues: [:])
-    XCTAssertEqual(withOrder(order).map(\.attribute.rawValue), facets)
-  }
-  
-  func testPartiallyStrictFacetsOrder() {
-    let facets = ["size", "brand", "*"]
-    let order = FacetOrdering(facets: FacetValuesOrder(order: facets, hide: nil, sortBy: nil), facetValues: [:])
-    XCTAssertEqual(withOrder(order).map(\.attribute.rawValue), ["size", "brand", "color", "country"])
-  }
-  
-  func testHideFacet() {
-    let facets = ["*"]
-    let order = FacetOrdering(facets: FacetValuesOrder(order: facets, hide: ["country"], sortBy: nil), facetValues: [:])
-    XCTAssertEqual(withOrder(order).map(\.attribute.rawValue), ["brand", "color", "size"])
-  }
-  
-  func testSortFacetsByCount() {
-    let facets = ["*"]
-    let order = FacetOrdering(facets: FacetValuesOrder(order: facets, hide: nil, sortBy: .count), facetValues: [:])
-    XCTAssertEqual(withOrder(order).map(\.attribute.rawValue), ["brand", "color", "size", "country"])
-  }
-  
-  func testStrictFacetValuesOrder() {
-    let countries = ["UK", "France", "USA", "Germany", "Finland", "Denmark", "Italy", "Spain"].shuffled()
-    let order = FacetOrdering(facets: FacetValuesOrder(order: ["*"], hide: nil, sortBy: nil), facetValues: ["country": .init(order: countries, hide: nil, sortBy: nil)])
-    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), countries)
-  }
-  
-  func testPartialFacetValuesOrder() {
-    let countries = ["UK", "France", "USA"].shuffled()
-    let order = FacetOrdering(facets: FacetValuesOrder(order: ["*"], hide: nil, sortBy: nil), facetValues: ["country": .init(order: countries, hide: nil, sortBy: nil)])
-    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), countries)
-  }
-  
-  func testPartiallyStrictFacetValuesOrder() {
-    let countries = ["UK", "France", "USA", "*"]
-    let order = FacetOrdering(facets: FacetValuesOrder(order: ["*"], hide: nil, sortBy: nil), facetValues: ["country": .init(order: countries, hide: nil, sortBy: nil)])
-    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), countries.dropLast() + ["Germany", "Finland", "Denmark", "Italy", "Spain"].sorted())
-  }
-  
-  func testHideFacetValues() {
-    let countries = ["UK", "France", "USA", "Germany", "Finland", "Denmark", "Italy", "Spain"].shuffled()
-    var expectedResult = countries
-    expectedResult.removeAll { $0 == "USA" }
-    expectedResult.sort()
-    let order = FacetOrdering(facets: FacetValuesOrder(order: ["*"], hide: nil, sortBy: nil), facetValues: ["country": .init(order: ["*"], hide: ["USA"], sortBy: nil)])
-    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), expectedResult)
-  }
-  
-  func testSortFacetValuesByCount() {
-    let expectedFacetValues = facets["country"]?.sorted(by: { $0.count < $1.count }).map(\.value)
-    let order = FacetOrdering(facets: FacetValuesOrder(order: ["*"], hide: nil, sortBy: nil), facetValues: ["country": .init(order: ["*"], hide: nil, sortBy: .count)])
-    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), expectedFacetValues)
-  }
-
-  
-}
diff --git a/Tests/InstantSearchCoreTests/Unit/DynamicFacets/FacetsOrdererTests.swift b/Tests/InstantSearchCoreTests/Unit/DynamicFacets/FacetsOrdererTests.swift
new file mode 100644
index 00000000..40022040
--- /dev/null
+++ b/Tests/InstantSearchCoreTests/Unit/DynamicFacets/FacetsOrdererTests.swift
@@ -0,0 +1,91 @@
+//
+//  FacetsOrdererTests.swift
+//  
+//
+//  Created by Vladislav Fitc on 14/04/2021.
+//
+
+import Foundation
+@testable import InstantSearchCore
+import XCTest
+
+class FacetsOrdererTests: XCTestCase {
+  
+  let facets: [Attribute: [Facet]] = [
+      "size": [
+        Facet(value: "XS", count: 82),
+        Facet(value: "L", count: 81),
+        Facet(value: "XXXL", count: 73),
+        Facet(value: "XXL", count: 71),
+        Facet(value: "M", count: 67),
+        Facet(value: "S", count: 67),
+        Facet(value: "XL", count: 67),
+      ],
+      "brand": [
+        Facet(value: "Dyson", count: 53),
+        Facet(value: "Sony", count: 53),
+        Facet(value: "Apple", count: 51),
+        Facet(value: "Uniqlo", count: 43),
+      ],
+      "color": [
+        Facet(value: "yellow", count: 65),
+        Facet(value: "blue", count: 63),
+        Facet(value: "red", count: 58),
+        Facet(value: "violet", count: 55),
+        Facet(value: "orange", count: 54),
+        Facet(value: "green", count: 48),
+      ],
+      "country": [
+        Facet(value: "Spain", count: 31),
+        Facet(value: "Finland", count: 27),
+        Facet(value: "Germany", count: 27),
+        Facet(value: "UK", count: 26),
+        Facet(value: "Italy", count: 25),
+        Facet(value: "France", count: 23),
+        Facet(value: "Denmark", count: 22),
+        Facet(value: "USA", count: 19),
+      ]
+  ]
+  
+  func withOrder(_ facetOrder: FacetOrdering) -> [AttributedFacets] {
+    return FacetsOrderer(facetOrder: facetOrder, facets: facets)()
+  }
+
+  func testStrictFacetsOrder() {
+    let facets: [Attribute] = ["size", "brand", "color", "country"].shuffled()
+    let order = FacetOrdering(facets: .init(order: facets), values: [:])
+    XCTAssertEqual(withOrder(order).map(\.attribute), facets)
+  }
+  
+  func testPartialFacetsOrder() {
+    let facets: [Attribute] = ["size", "country"]
+    let order = FacetOrdering(facets: .init(order: facets), values: [:])
+    XCTAssertEqual(withOrder(order).map(\.attribute), facets)
+  }
+        
+  func testStrictFacetValuesOrder() {
+    let countries = ["UK", "France", "USA", "Germany", "Finland", "Denmark", "Italy", "Spain"].shuffled()
+    let order = FacetOrdering(facets: .init(order: ["country"]), values: ["country": .init(order: countries, sortRemainingBy: .none)])
+    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), countries)
+  }
+  
+  func testPartialFacetValuesOrder() {
+    let countries = ["UK", "France", "USA"].shuffled()
+    let order = FacetOrdering(facets: .init(order: ["country"]), values: ["country": .init(order: countries, sortRemainingBy: .none)])
+    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), countries)
+  }
+  
+  func testPartiallyStrictFacetValuesOrder() {
+    let countries = ["UK", "France", "USA"]
+    let order = FacetOrdering(facets: .init(order: ["country"]), values: ["country": .init(order: countries, sortRemainingBy: .alpha)])
+    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), countries + ["Germany", "Finland", "Denmark", "Italy", "Spain"].sorted())
+  }
+  
+  func testSortFacetValuesByCount() {
+    let expectedFacetValues = facets["country"]?.sorted(by: { $0.count > $1.count }).map(\.value)
+    let order = FacetOrdering(facets: .init(order: ["country"]), values: ["country": .init(order: [], sortRemainingBy: .count)])
+    XCTAssertEqual(withOrder(order).first(where: { $0.attribute == "country" })?.facets.map(\.value), expectedFacetValues)
+  }
+
+  
+}