diff -r e06249e09f99 -r c8d692131b1e tests/test_list.c
--- a/tests/test_list.c	Sun Jan 14 13:50:17 2024 +0100
+++ b/tests/test_list.c	Mon Jan 15 20:59:18 2024 +0100
@@ -867,30 +867,29 @@
     cx_testing_allocator_destroy(&talloc);
 #define roll_out_test_combos(name, body) \
 static CX_TEST_SUBROUTINE(test_list_verify_##name, CxList *list, \
-    __attribute__((__unused__)) bool isptrlist, \
-    __attribute__((__unused__)) bool islinkedlist) body \
+    __attribute__((__unused__)) bool isptrlist) body \
 CX_TEST(test_list_ll_##name) { \
     set_up_combo \
         CxList *list = cxLinkedListCreate(alloc, cx_cmp_int, sizeof(int)); \
-        CX_TEST_CALL_SUBROUTINE(test_list_verify_##name, list, false, true); \
+        CX_TEST_CALL_SUBROUTINE(test_list_verify_##name, list, false); \
     tear_down_combo \
 } \
 CX_TEST(test_list_arl_##name) { \
     set_up_combo \
         CxList *list = cxArrayListCreate(alloc, cx_cmp_int, sizeof(int), 8); \
-        CX_TEST_CALL_SUBROUTINE(test_list_verify_##name, list, false, false); \
+        CX_TEST_CALL_SUBROUTINE(test_list_verify_##name, list, false); \
     tear_down_combo \
 } \
 CX_TEST(test_list_pll_##name) { \
     set_up_combo \
         CxList *list = cxLinkedListCreate(alloc, cx_cmp_int, CX_STORE_POINTERS); \
-        CX_TEST_CALL_SUBROUTINE(test_list_verify_##name, list, true, true); \
+        CX_TEST_CALL_SUBROUTINE(test_list_verify_##name, list, true); \
     tear_down_combo \
 } \
 CX_TEST(test_list_parl_##name) { \
     set_up_combo \
         CxList *list = cxArrayListCreate(alloc, cx_cmp_int, CX_STORE_POINTERS, 8); \
-        CX_TEST_CALL_SUBROUTINE(test_list_verify_##name, list, true, false); \
+        CX_TEST_CALL_SUBROUTINE(test_list_verify_##name, list, true); \
     tear_down_combo \
 }
 #define array_init(...) {__VA_ARGS__}
@@ -1080,17 +1079,18 @@
     }
 })
 
-roll_out_test_combos(swap_no_sbo, {
-    if (islinkedlist) {
-        CX_DISABLE_LINKED_LIST_SWAP_SBO = true;
-        CX_TEST_CALL_SUBROUTINE(test_list_verify_swap, list, isptrlist, true);
-        CX_DISABLE_LINKED_LIST_SWAP_SBO = false;
-    } else {
-        CX_DISABLE_ARRAY_LIST_SWAP_SBO = true;
-        CX_TEST_CALL_SUBROUTINE(test_list_verify_swap, list, isptrlist, false);
-        CX_DISABLE_ARRAY_LIST_SWAP_SBO = false;
-    }
-})
+CX_TEST(test_list_ll_swap_no_sbo) {
+    set_up_combo
+        CxList *list = cxLinkedListCreate(alloc, cx_cmp_int, 2*cx_linked_list_swap_sbo_size);
+        CX_TEST_CALL_SUBROUTINE(test_list_verify_swap, list, false);
+    tear_down_combo
+}
+CX_TEST(test_list_arl_swap_no_sbo) {
+    set_up_combo
+        CxList *list = cxArrayListCreate(alloc, cx_cmp_int, 2*cx_array_swap_sbo_size, 8);
+        CX_TEST_CALL_SUBROUTINE(test_list_verify_swap, list, false);
+    tear_down_combo
+}
 
 roll_out_test_combos(find, {
     const size_t testdata_len = 500;
@@ -1368,7 +1368,6 @@
     cx_test_register(suite, test_list_arl_swap);
     cx_test_register(suite, test_list_parl_swap);
     cx_test_register(suite, test_list_arl_swap_no_sbo);
-    cx_test_register(suite, test_list_parl_swap_no_sbo);
     cx_test_register(suite, test_list_arl_find);
     cx_test_register(suite, test_list_parl_find);
     cx_test_register(suite, test_list_arl_sort);
@@ -1440,7 +1439,6 @@
     cx_test_register(suite, test_list_ll_swap);
     cx_test_register(suite, test_list_pll_swap);
     cx_test_register(suite, test_list_ll_swap_no_sbo);
-    cx_test_register(suite, test_list_pll_swap_no_sbo);
     cx_test_register(suite, test_list_ll_find);
     cx_test_register(suite, test_list_pll_find);
     cx_test_register(suite, test_list_ll_sort);