--- libmalloc/libmalloc-792.80.2/tests/calloc_test.c
+++ libmalloc/libmalloc-317.40.8/tests/calloc_test.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <malloc/malloc.h>
 
-T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true), T_META_TAG_ALL_ALLOCATORS);
+T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true));
 
 static inline void*
 t_calloc(size_t count, size_t s)
@@ -43,14 +43,14 @@
 	void *ptrs[P] = {};
 	for (size_t i = 0, j = 0, k = 0; i < n + P; i++, j = k, k = (k + 1) % P) {
 		void *ptr = NULL;
-		if (i < n) ptr = t_calloc(count, min + (arc4random() % r) * incr);
+		if (i < n) ptr = t_calloc(count, min + arc4random_uniform(r) * incr);
 		free(ptrs[j]);
 		ptrs[k] = ptr;
 	}
 }
 
 T_DECL(calloc_overflow_nano, "calloc with overflow (nano)",
-	T_META_ENVVAR("MallocNanoZone=1"), T_META_TAG_VM_PREFERRED)
+	T_META_ENVVAR("MallocNanoZone=1"))
 {
 	void *ptr = calloc(LONG_MAX, 256);
 	T_ASSERT_EQ(ptr, NULL, "calloc overflow check #1");
@@ -62,7 +62,7 @@
 }
 
 T_DECL(calloc_overflow, "calloc with overflow",
-	T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_VM_PREFERRED)
+	T_META_ENVVAR("MallocNanoZone=0"))
 {
 	void *ptr = calloc(LONG_MAX, 1000);
 	T_ASSERT_EQ(ptr, NULL, "calloc overflow check #1");
@@ -74,7 +74,7 @@
 }
 
 T_DECL(calloc_nano, "nano calloc all sizes <= 256",
-	   T_META_ENVVAR("MallocNanoZone=1"), T_META_TAG_VM_PREFERRED)
+	   T_META_ENVVAR("MallocNanoZone=1"))
 {
 	test_calloc(1, 0, 256, 1);		// NANO_MAX_SIZE
 	test_calloc_random(1, 0, 256, 1, 100);
@@ -87,7 +87,7 @@
 }
 
 T_DECL(calloc_tiny, "tiny calloc 16b increments <= 1008",
-	   T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_VM_PREFERRED)
+	   T_META_ENVVAR("MallocNanoZone=0"))
 {
 	test_calloc(1, 0, 1008, 16); 		// SMALL_THRESHOLD
 	test_calloc_random(1, 0, 1008, 16, 100);
@@ -103,7 +103,7 @@
 // run) and for some AppleTVs, so use a cut-down version.
 #if TARGET_OS_WATCH || TARGET_OS_TV
 T_DECL(calloc, "calloc all 2048b increments <= 130kb",
-	   T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_VM_NOT_PREFERRED)
+	   T_META_ENVVAR("MallocNanoZone=0"))
 {
 	test_calloc(1, 1024, 130 * 1024, 2048);		// > LARGE_THRESHOLD_LARGEMEM
 	test_calloc_random(1, 1024, 130 * 1024, 2048, 50);
@@ -116,7 +116,7 @@
 }
 #else // !TARGET_OS_WATCH && !TARGET_OS_TV
 T_DECL(calloc, "calloc all 512b increments <= 256kb",
-	   T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_VM_NOT_PREFERRED)
+	   T_META_ENVVAR("MallocNanoZone=0"))
 {
 	test_calloc(1, 1024, 256 * 1024, 512);		// > LARGE_THRESHOLD_LARGEMEM
 	test_calloc_random(1, 1024, 256 * 1024, 512, 100);