diff --git a/spec/db-cars.cr b/spec/db-cars.cr
index d3cb462..65bc407 100644
--- a/spec/db-cars.cr
+++ b/spec/db-cars.cr
@@ -25,12 +25,12 @@ class Car
 	]
 
 	# Equality is true if every property is identical.
-	def ==(other)
+	def ==(other : Car)
 		@name == other.name && @color == other.color && @keywords == other.keywords
 	end
 
 	# Equality is true if every property is identical.
-	def <=>(other)
+	def <=>(other : Car)
 		@name <=> other.name
 	end
 end
@@ -96,6 +96,7 @@ def add_cars(storage : DODB::Storage, nb_iterations : Int32, max_indexes = 5000)
 		storage.unsafe_add car3.clone
 		storage.unsafe_add car4.clone
 		storage.unsafe_add car5.clone
+
 		i += 1
 		#STDOUT.write "\radding value #{i}".to_slice
 	end
diff --git a/spec/test-cars.cr b/spec/test-cars.cr
index 6df4c97..2cee998 100644
--- a/spec/test-cars.cr
+++ b/spec/test-cars.cr
@@ -47,8 +47,8 @@ describe "tracking inconsistencies between implementations" do
 		cars_ram2 = DODB::RAMOnlySpecDataBase(Car).new "-2"
 
 		uncached_searchby_name, uncached_searchby_color, uncached_searchby_keywords = uncached_indexes cars_ram0
-		cached_searchby_name, cached_searchby_color, cached_searchby_keywords = cached_indexes cars_ram1
-		ram_searchby_name, ram_searchby_color, ram_searchby_keywords = ram_indexes cars_ram2
+		cached_searchby_name,   cached_searchby_color,   cached_searchby_keywords   = cached_indexes   cars_ram1
+		ram_searchby_name,      ram_searchby_color,      ram_searchby_keywords      = ram_indexes      cars_ram2
 
 		add_cars cars_ram0, 1
 		add_cars cars_ram1, 1
@@ -57,25 +57,34 @@ describe "tracking inconsistencies between implementations" do
 		# Searches should be consistent between all implementations of basic indexes, partitions and tags.
 
 		# Basic index.
-		uncached_corvet_car = uncached_searchby_color.get_with_keys? "Corvet-0"
-		cached_corvet_car   = cached_searchby_color.get_with_keys?   "Corvet-0"
-		ram_corvet_car      = ram_searchby_color.get_with_keys?      "Corvet-0"
+		uncached_corvet_car = uncached_searchby_name.get? "Corvet-0"
+		cached_corvet_car   = cached_searchby_name.get?   "Corvet-0"
+		ram_corvet_car      = ram_searchby_name.get?      "Corvet-0"
 		uncached_corvet_car.should eq cached_corvet_car
 		uncached_corvet_car.should eq ram_corvet_car
+		uncached_corvet_car.should eq corvet0
 
 		# Partitions.
+		red_cars = [ Car.new("Corvet-0", "red", [ "shiny", "impressive", "fast", "elegant" ]),
+				Car.new("Ford-5-0", "red", [ "unknown" ])
+			]
 		uncached_red_cars = uncached_searchby_color.get? "red"
 		cached_red_cars   = cached_searchby_color.get?   "red"
 		ram_red_cars      = ram_searchby_color.get?      "red"
 		uncached_red_cars.sort.should eq cached_red_cars.sort
 		uncached_red_cars.sort.should eq ram_red_cars.sort
+		uncached_red_cars.sort.should eq red_cars.sort
 
 		# Tags.
+		fast_cars = [ Car.new("Corvet-0", "red", [ "shiny", "impressive", "fast", "elegant" ]),
+				Car.new("Bullet-GT-0", "blue", [ "shiny", "fast", "expensive" ])
+			]
 		uncached_fast_cars = uncached_searchby_keywords.get? "fast"
 		cached_fast_cars   = cached_searchby_keywords.get?   "fast"
 		ram_fast_cars      = ram_searchby_keywords.get?      "fast"
 		uncached_fast_cars.sort.should eq cached_fast_cars.sort
 		uncached_fast_cars.sort.should eq ram_fast_cars.sort
+		uncached_fast_cars.sort.should eq fast_cars.sort
 
 		cars_ram0.rm_storage_dir
 		cars_ram1.rm_storage_dir