--- libmalloc/libmalloc-374.100.5/tests/malloc_free_test.c
+++ libmalloc/libmalloc-166.251.2/tests/malloc_free_test.c
@@ -9,9 +9,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <malloc/malloc.h>
-#include "../src/internal.h"
-
-T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true));
 
 static inline void*
 t_malloc(size_t s)
@@ -63,8 +60,8 @@
 T_DECL(malloc_free_tiny, "tiny malloc and free 16b increments <= 1008",
 	   T_META_ENVVAR("MallocNanoZone=0"))
 {
-	test_malloc_free(0, TINY_LIMIT_THRESHOLD, 16);
-	test_malloc_free_random(0, TINY_LIMIT_THRESHOLD, 16, 10000);
+	test_malloc_free(0, 1008, 16); // SMALL_THRESHOLD
+	test_malloc_free_random(0, 1008, 16, 10000);
 }
 
 T_DECL(malloc_free, "malloc and free all 512b increments <= 256kb",
@@ -73,72 +70,3 @@
 	test_malloc_free(1024, 256 * 1024, 512); // > LARGE_THRESHOLD_LARGEMEM
 	test_malloc_free_random(1024, 256 * 1024, 512, 100000);
 }
-
-T_DECL(malloc_free_medium, "medium malloc and free all 32kb increments <= 8mb",
-	   T_META_ENVVAR("MallocMediumZone=1"),
-	   T_META_ENVVAR("MallocMediumActivationThreshold=1"),
-	   T_META_ENABLED(CONFIG_MEDIUM_ALLOCATOR))
-{
-	test_malloc_free(SMALL_LIMIT_THRESHOLD, MEDIUM_LIMIT_THRESHOLD, 32 * 1024);
-	test_malloc_free_random(SMALL_LIMIT_THRESHOLD, MEDIUM_LIMIT_THRESHOLD, 32 * 1024, 1000);
-}
-
-#pragma mark MallocAggressiveMadvise=1
-
-T_DECL(malloc_free_tiny_aggressive_madvise, "tiny malloc and free all 16b increments with aggressive madvise",
-	   T_META_ENVVAR("MallocNanoZone=0"),
-	   T_META_ENVVAR("MallocAggressiveMadvise=1"),
-	   T_META_ENABLED(CONFIG_AGGRESSIVE_MADVISE))
-{
-	test_malloc_free(0, TINY_LIMIT_THRESHOLD, 16);
-	test_malloc_free_random(0, TINY_LIMIT_THRESHOLD, 16, 10000);
-}
-
-T_DECL(malloc_free_small_aggressive_madvise, "small malloc and free all 512b with aggressive madvise",
-	   T_META_ENVVAR("MallocNanoZone=0"),
-	   T_META_ENVVAR("MallocAggressiveMadvise=1"),
-	   T_META_ENABLED(CONFIG_AGGRESSIVE_MADVISE))
-{
-	test_malloc_free(TINY_LIMIT_THRESHOLD, SMALL_LIMIT_THRESHOLD, 512);
-	test_malloc_free_random(TINY_LIMIT_THRESHOLD, SMALL_LIMIT_THRESHOLD, 512, 100000);
-}
-
-T_DECL(malloc_free_medium_aggressive_madvise, "medium malloc and free all 32kb increments with aggressive madvise",
-	   T_META_ENVVAR("MallocMediumZone=1"),
-	   T_META_ENVVAR("MallocAggressiveMadvise=1"),
-	   T_META_ENVVAR("MallocMediumActivationThreshold=1"),
-	   T_META_ENABLED(CONFIG_MEDIUM_ALLOCATOR),
-	   T_META_ENABLED(CONFIG_AGGRESSIVE_MADVISE))
-{
-	test_malloc_free(SMALL_LIMIT_THRESHOLD, MEDIUM_LIMIT_THRESHOLD, 32 * 1024);
-	test_malloc_free_random(SMALL_LIMIT_THRESHOLD, MEDIUM_LIMIT_THRESHOLD, 32 * 1024, 1000);
-}
-
-#pragma mark MallocLargeCache=0
-
-T_DECL(malloc_free_large_no_cache, "large malloc and free 1mb increments of first 8mb with large cache disabled",
-	   T_META_ENVVAR("MallocLargeCache=0"),
-	   T_META_ENABLED(CONFIG_LARGE_CACHE))
-{
-	test_malloc_free(MEDIUM_LIMIT_THRESHOLD, MEDIUM_LIMIT_THRESHOLD + (8 * 1024 * 1024), 1024 * 1024);
-	test_malloc_free_random(MEDIUM_LIMIT_THRESHOLD, MEDIUM_LIMIT_THRESHOLD + (8 * 1024 * 1024), 1024 * 1024, 1000);
-}
-
-#pragma mark MallocSpaceEfficient=1
-
-T_DECL(malloc_free_space_efficient, "malloc and free all 512b increments <= 256kb with MallocSpaceEfficient=1",
-	   T_META_ENVVAR("MallocNanoZone=0"),
-	   T_META_ENVVAR("MallocSpaceEfficient=1"),
-	   T_META_ENABLED(CONFIG_AGGRESSIVE_MADVISE))
-{
-	test_malloc_free(0, 256 * 1024, 512); // > LARGE_THRESHOLD_LARGEMEM
-	test_malloc_free_random(0, 256 * 1024, 512, 100000);
-}
-
-T_DECL(malloc_free_large_space_efficient, "large malloc and free 1mb increments of first 8mb with MallocSpaceEfficient=1",
-	   T_META_ENVVAR("MallocSpaceEfficient=1"),
-	   T_META_ENABLED(CONFIG_LARGE_CACHE))
-{
-	test_malloc_free(MEDIUM_LIMIT_THRESHOLD, MEDIUM_LIMIT_THRESHOLD + (8 * 1024 * 1024), 1024 * 1024);
-	test_malloc_free_random(MEDIUM_LIMIT_THRESHOLD, MEDIUM_LIMIT_THRESHOLD + (8 * 1024 * 1024), 1024 * 1024, 1000);
-}