--- libmalloc/libmalloc-374.60.3/tests/magazine_tiny_test.c
+++ libmalloc/libmalloc-166.220.1/tests/magazine_tiny_test.c
@@ -11,21 +11,18 @@
 #include "../src/magazine_tiny.c"
 #include "magazine_testing.h"
 
-// Stubs
-bool aggressive_madvise_enabled = DEFAULT_AGGRESSIVE_MADVISE_ENABLED;
-
-T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true));
-
 static inline void
-tiny_test_rack_setup(rack_t *rack)
+test_rack_setup(rack_t *rack)
 {
-	test_rack_setup(rack, RACK_TYPE_TINY);
+	memset(rack, 'a', sizeof(rack));
+	rack_init(rack, RACK_TYPE_TINY, 1, 0);
+	T_QUIET; T_ASSERT_NOTNULL(rack->magazines, "magazine initialisation");
 }
 
 T_DECL(basic_tiny_alloc, "tiny rack init and alloc")
 {
 	struct rack_s rack;
-	tiny_test_rack_setup(&rack);
+	test_rack_setup(&rack);
 
 	void *ptr = tiny_malloc_should_clear(&rack, TINY_MSIZE_FOR_BYTES(32), false);
 	T_ASSERT_NOTNULL(ptr, "allocation");
@@ -40,7 +37,7 @@
 T_DECL(basic_tiny_teardown, "tiny rack init, alloc, teardown")
 {
 	struct rack_s rack;
-	tiny_test_rack_setup(&rack);
+	test_rack_setup(&rack);
 
 	void *ptr = tiny_malloc_should_clear(&rack, TINY_MSIZE_FOR_BYTES(32), false);
 	T_ASSERT_NOTNULL(ptr, "allocation");
@@ -60,13 +57,13 @@
 T_DECL(basic_tiny_free, "tiny free")
 {
 	struct rack_s rack;
-	tiny_test_rack_setup(&rack);
+	test_rack_setup(&rack);
 
 	void *ptr = tiny_malloc_should_clear(&rack, TINY_MSIZE_FOR_BYTES(32), false);
 	T_ASSERT_NOTNULL(ptr, "allocation");
 
 	// free doesn't return an error (unless we assert here)
-	free_tiny(&rack, ptr, TINY_REGION_FOR_PTR(ptr), 0, false);
+	free_tiny(&rack, ptr, TINY_REGION_FOR_PTR(ptr), 0);
 
 	size_t sz = tiny_size(&rack, ptr);
 	T_ASSERT_EQ((int)sz, 0, "allocation freed (sz == 0)");
@@ -75,7 +72,7 @@
 T_DECL(basic_tiny_shrink, "tiny rack shrink")
 {
 	struct rack_s rack;
-	tiny_test_rack_setup(&rack);
+	test_rack_setup(&rack);
 
 	void *ptr = tiny_malloc_should_clear(&rack, TINY_MSIZE_FOR_BYTES(64), false);
 	T_ASSERT_NOTNULL(ptr, "allocation");
@@ -92,7 +89,7 @@
 T_DECL(basic_tiny_realloc_in_place, "tiny rack realloc in place")
 {
 	struct rack_s rack;
-	tiny_test_rack_setup(&rack);
+	test_rack_setup(&rack);
 
 	// Allocate two blocks and free the second, then try to realloc() the first.
 	// This should extend in-place using the one-level death row cache that's
@@ -106,7 +103,7 @@
 	void *ptr2 = tiny_malloc_should_clear(&rack, TINY_MSIZE_FOR_BYTES(16), false);
 	T_ASSERT_NOTNULL(ptr2, "allocation 2");
 	T_ASSERT_EQ_PTR(ptr2, (void *)((uintptr_t)ptr + 16), "sequential allocations");
-	free_tiny(&rack, ptr2, TINY_REGION_FOR_PTR(ptr2), 0, false);
+	free_tiny(&rack, ptr2, TINY_REGION_FOR_PTR(ptr2), 0);
 
 	// Attempt to realloc up to 32 bytes, this should happen in place
 	// because of the death-row cache.
@@ -123,5 +120,5 @@
 	nsz = tiny_size(&rack, ptr);
 	T_ASSERT_EQ((int)nsz, 64, "realloc size == 64");
 
-	free_tiny(&rack, ptr, TINY_REGION_FOR_PTR(ptr), 0, false);
+	free_tiny(&rack, ptr, TINY_REGION_FOR_PTR(ptr), 0);
 }