--- libmalloc/libmalloc-792.41.1/tests/malloc_create_purgeable_zone.c
+++ libmalloc/libmalloc-646.40.3/tests/malloc_create_purgeable_zone.c
@@ -40,7 +40,7 @@
 }
 
 T_DECL(malloc_create_purgeable_zone, "create a purgeable zone while constantly registering zones",
-		T_META_TAG_ALL_ALLOCATORS,
+		T_META_TAG_XZONE,
 		T_META_TAG_VM_NOT_PREFERRED)
 {
 	pthread_t zone_threads[N_ZONE_CREATION_THREADS];
@@ -62,7 +62,7 @@
 
 T_DECL(malloc_purgeable_zone_helper,
 		"Test that the purgeable zone uses the default xzone as its helper",
-		T_META_TAG_XZONE_ONLY, T_META_TAG_VM_PREFERRED)
+		T_META_TAG_XZONE_ONLY)
 {
 	malloc_zone_t *purgeable_zone = malloc_default_purgeable_zone();
 	malloc_zone_t *default_zone = malloc_zones[0];
@@ -79,13 +79,13 @@
 	void *large_ptr = malloc_zone_malloc(purgeable_zone, KiB(64));
 	T_ASSERT_NOTNULL(large_ptr, NULL);
 
-	T_ASSERT_EQ(purgeable_zone->size(purgeable_zone, small_ptr), 0ul,
+	T_ASSERT_EQ(purgeable_zone->size(purgeable_zone, small_ptr), 0,
 			"Purgeable zone doesn't claim small allocation");
-	T_ASSERT_NE(default_zone->size(default_zone, small_ptr), 0ul,
+	T_ASSERT_NE(default_zone->size(default_zone, small_ptr), 0,
 			"Default zone claims small allocation");
-	T_ASSERT_NE(purgeable_zone->size(purgeable_zone, large_ptr), 0ul,
+	T_ASSERT_NE(purgeable_zone->size(purgeable_zone, large_ptr), 0,
 			"Purgeable zone claims large allocation");
-	T_ASSERT_EQ(default_zone->size(default_zone, large_ptr), 0ul,
+	T_ASSERT_EQ(default_zone->size(default_zone, large_ptr), 0,
 			"Default zone doesn't claim large allocation");
 
 	free(small_ptr);
@@ -103,9 +103,8 @@
 	return state;
 }
 
-T_DECL(malloc_purgeable_vm_size,
-		"check that the size of a purgeable allocation matches the vm object size",
-		T_META_TAG_ALL_ALLOCATORS, T_META_TAG_VM_PREFERRED)
+T_DECL(malloc_purgeable_vm_size, "check that the size of a purgeable allocation matches the vm object size",
+		T_META_TAG_XZONE)
 {
 	// All allocations that come out of the purgeable zone should be a VM object,
 	// since we need to be able to tag it as purgeable or non-purgeable. The VM
@@ -191,17 +190,17 @@
 
 T_DECL(purgeable_aligned_alloc,
 		"Make an aligned purgeable allocation smaller than the minimum purgeable size",
-		T_META_TAG_ALL_ALLOCATORS, T_META_TAG_VM_PREFERRED)
+		T_META_TAG_XZONE)
 {
 	void *ptr = malloc_zone_memalign(malloc_default_purgeable_zone(), KiB(64),
 			KiB(32));
 	T_ASSERT_NOTNULL(ptr, "Aligned allocation");
-	T_ASSERT_GE(malloc_size(ptr), (size_t)KiB(32), "Allocation is large enough");
+	T_ASSERT_GE(malloc_size(ptr), KiB(32), "Allocation is large enough");
 	malloc_zone_free(malloc_default_purgeable_zone(), ptr);
 }
 
 T_DECL(purgeable_realloc, "Test reallocating pointers from the purgeable zone",
-		T_META_TAG_ALL_ALLOCATORS, T_META_TAG_VM_PREFERRED)
+		T_META_TAG_XZONE)
 {
 	// Test reallocating from the purgeable zone to the purgeable zone
 	void *ptr = malloc_zone_malloc(malloc_default_purgeable_zone(), KiB(64));