diff --git a/src/H5CX.c b/src/H5CX.c
index ae0cd252d0a..b2b51bcf457 100644
--- a/src/H5CX.c
+++ b/src/H5CX.c
@@ -2522,16 +2522,13 @@ H5CX_get_no_selection_io_cause(uint32_t *no_selection_io_cause)
 } /* end H5CX_get_no_selection_io_cause() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5CX_get_no_selection_io_cause
+ * Function:    H5CX_get_actual_selection_io_mode
  *
  * Purpose:     Retrieves the cause for not performing selection I/O
  *              for the current API call context.
  *
  * Return:      Non-negative on success / Negative on failure
  *
- * Programmer:  Vailin Choi
- *              April 15, 2023
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -3526,9 +3523,6 @@ H5CX_set_no_selection_io_cause(uint32_t no_selection_io_cause)
  *
  * Return:      <none>
  *
- * Programmer:  Vailin Choi
- *              April 15, 2023
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -3548,7 +3542,7 @@ H5CX_set_actual_selection_io_mode(uint32_t actual_selection_io_mode)
         /* Cache the value for later, marking it to set in DXPL when context popped */
         (*head)->ctx.actual_selection_io_mode     = actual_selection_io_mode;
         (*head)->ctx.actual_selection_io_mode_set = TRUE;
-    } /* end if */
+    }
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5CX_set_actual_selection_io_mode() */
diff --git a/test/select_io_dset.c b/test/select_io_dset.c
index 9d2ca07e26e..23c3f5ff9ca 100644
--- a/test/select_io_dset.c
+++ b/test/select_io_dset.c
@@ -110,7 +110,7 @@ check_actual_selection_io_mode(hid_t dxpl, uint32_t sel_io_mode_expected)
     uint32_t actual_sel_io_mode;
 
     if (H5Pget_actual_selection_io_mode(dxpl, &actual_sel_io_mode) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (actual_sel_io_mode != sel_io_mode_expected)
         TEST_ERROR;
 
@@ -145,14 +145,14 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
     /* Create 1d data space */
     dims[0] = DSET_SELECT_DIM;
     if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Generate dataset name */
@@ -161,7 +161,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
 
     /* Create dataset */
     if ((did = H5Dcreate2(fid, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize data */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -171,23 +171,23 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
 
     /* Create dataset transfer property list */
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set modify write buffer if requested */
     if (mwbuf)
         if (H5Pset_modify_write_buf(dxpl, true) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     if ((ntrans_dxpl = H5Pcopy(dxpl)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set data transform */
     if (dtrans)
         if (H5Pset_data_transform(dxpl, expr) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     /* Copy wbuf if the library will be modifying it */
     if (mwbuf)
@@ -195,7 +195,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
 
     /* Write data to the dataset with/without data transform */
     if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify selection I/O mode */
     if (check_actual_selection_io_mode(dxpl, chunked ? 0 : H5D_SCALAR_IO) < 0)
@@ -207,7 +207,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
 
     /* Read data from the dataset without data transform set in dxpl */
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify selection I/O mode */
     if (check_actual_selection_io_mode(dxpl, chunked ? 0 : H5D_SCALAR_IO) < 0)
@@ -226,7 +226,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
 
         /* Read the data from the dataset with data transform set in dxpl */
         if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Verify data read is transformed a second time */
         for (i = 0; i < DSET_SELECT_DIM; i++)
@@ -239,15 +239,15 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
     }
 
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(ntrans_dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     PASSED();
 
@@ -290,35 +290,35 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
     char    dset_name[DSET_NAME_LEN];
 
     if ((wbuf = (char *)malloc((size_t)(4 * DSET_SELECT_DIM))) == NULL)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (mwbuf && (wbuf_bak = (char *)malloc((size_t)(4 * DSET_SELECT_DIM))) == NULL)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if ((rbuf = (char *)malloc((size_t)(4 * DSET_SELECT_DIM))) == NULL)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Create dataset transfer property list */
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set modify write buffer if requested */
     if (mwbuf)
         if (H5Pset_modify_write_buf(dxpl, true) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     /* Create 1d data space */
     dims[0] = DSET_SELECT_DIM;
     if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Generate dataset name */
@@ -327,7 +327,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create 1d dataset */
     if ((did = H5Dcreate2(fid, dset_name, H5T_STD_I32BE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize data */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -343,7 +343,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Write the data to the dataset with little endian */
     if (H5Dwrite(did, H5T_STD_I32LE, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify selection I/O mode */
     if (check_actual_selection_io_mode(dxpl, chunked ? 0 : H5D_SCALAR_IO) < 0)
@@ -355,7 +355,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Read the data from the dataset with little endian */
     if (H5Dread(did, H5T_STD_I32LE, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify selection I/O mode */
     if (check_actual_selection_io_mode(dxpl, chunked ? 0 : H5D_SCALAR_IO) < 0)
@@ -373,7 +373,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Read the data from the dataset with big endian */
     if (H5Dread(did, H5T_STD_I32BE, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify data read in big endian */
     for (i = 0; i < DSET_SELECT_DIM; i++)
@@ -386,13 +386,13 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         }
 
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     free(wbuf);
     free(wbuf_bak);
@@ -451,14 +451,14 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
     /* Create 1d data space */
     dims[0] = DSET_SELECT_DIM;
     if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Generate dataset name */
@@ -467,7 +467,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
 
     /* Create dataset */
     if ((did = H5Dcreate2(fid, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize data */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -477,23 +477,23 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
 
     /* Create dataset transfer property list */
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set modify write buffer if requested */
     if (mwbuf)
         if (H5Pset_modify_write_buf(dxpl, true) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     if ((ntrans_dxpl = H5Pcopy(dxpl)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set data transform */
     if (dtrans)
         if (H5Pset_data_transform(dxpl, expr) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     /* Copy wbuf if the library will be modifying it */
     if (mwbuf)
@@ -501,7 +501,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
 
     /* Write data to the dataset with/without data transform set in dxpl */
     if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify selection I/O mode */
     if (check_actual_selection_io_mode(dxpl, chunked ? 0 : H5D_SCALAR_IO) < 0)
@@ -513,7 +513,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
 
     /* Read the data from the dataset without data transform in dxpl */
     if (H5Dread(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify selection I/O mode */
     if (check_actual_selection_io_mode(dxpl, chunked ? 0 : H5D_SCALAR_IO) < 0)
@@ -532,7 +532,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
 
         /* Read data from the dataset with data transform set in dxpl */
         if (H5Dread(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Verify data read is transformed a second time */
         for (i = 0; i < DSET_SELECT_DIM; i++)
@@ -545,15 +545,15 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
     }
 
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(ntrans_dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     PASSED();
 
@@ -601,14 +601,14 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
     /* Create 1d data space */
     dims[0] = DSET_SELECT_DIM;
     if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Generate dataset name */
@@ -617,7 +617,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
 
     /* Create 1d chunked dataset with/without data transform */
     if ((did = H5Dcreate2(fid, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize data */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -627,23 +627,23 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
 
     /* Create dataset transfer property list */
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set modify write buffer if requested */
     if (mwbuf)
         if (H5Pset_modify_write_buf(dxpl, true) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     if ((ntrans_dxpl = H5Pcopy(dxpl)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set data transform */
     if (dtrans) {
         if (H5Pset_data_transform(dxpl, expr) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Copy wbuf if the library will be modifying it */
@@ -652,7 +652,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
 
     /* Write data to the dataset with/without data transform in dxpl */
     if (H5Dwrite(did, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify selection I/O mode */
     if (check_actual_selection_io_mode(dxpl, chunked ? 0 : H5D_SCALAR_IO) < 0)
@@ -664,7 +664,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
 
     /* Read data from the dataset without data transform in dxpl */
     if (H5Dread(did, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify selection I/O mode */
     if (check_actual_selection_io_mode(dxpl, chunked ? 0 : H5D_SCALAR_IO) < 0)
@@ -683,7 +683,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
 
         /* Read data from the dataset with data transform set in dxpl */
         if (H5Dread(did, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Verify data read is transformed a second time */
         for (i = 0; i < DSET_SELECT_DIM; i++)
@@ -696,15 +696,15 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
     }
 
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(ntrans_dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     PASSED();
 
@@ -771,51 +771,51 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create dataset transfer property list */
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set modify write buffer if requested */
     if (mwbuf)
         if (H5Pset_modify_write_buf(dxpl, true) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     /* Allocate buffers for datasets */
     if (NULL == (s1_wbuf = (s1_t *)malloc(sizeof(s1_t) * DSET_SELECT_DIM)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (mwbuf && NULL == (s1_wbuf_bak = (s1_t *)malloc(sizeof(s1_t) * DSET_SELECT_DIM)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (s1_rbuf = (s1_t *)malloc(sizeof(s1_t) * DSET_SELECT_DIM)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (s2_wbuf = (s2_t *)malloc(sizeof(s2_t) * DSET_SELECT_DIM)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (mwbuf && NULL == (s2_wbuf_bak = (s2_t *)malloc(sizeof(s2_t) * DSET_SELECT_DIM)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (s2_rbuf = (s2_t *)malloc(sizeof(s2_t) * DSET_SELECT_DIM)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Create the memory data type */
     if ((s1_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Tinsert(s1_tid, "a", HOFFSET(s1_t, a), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s1_tid, "b", HOFFSET(s1_t, b), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s1_tid, "c", HOFFSET(s1_t, c), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s1_tid, "d", HOFFSET(s1_t, d), H5T_NATIVE_INT) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Create 1d data space */
     dims[0] = DSET_SELECT_DIM;
     if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Case 5(a) */
@@ -826,7 +826,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create 1d dataset */
     if ((did = H5Dcreate2(fid, dset_name, s1_tid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize data */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -842,7 +842,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Write all the data to the dataset */
     if (H5Dwrite(did, s1_tid, H5S_ALL, H5S_ALL, dxpl, s1_wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Restore wbuf from backup if the library modified it */
     if (mwbuf)
@@ -850,7 +850,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Read all the data from the dataset */
     if (H5Dread(did, s1_tid, H5S_ALL, H5S_ALL, dxpl, s1_rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify data read */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -875,12 +875,12 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create a compound type same size as s1_t */
     if ((ss_ac_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* but contains only subset members of s1_t */
     if (H5Tinsert(ss_ac_tid, "a", HOFFSET(s1_t, a), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(ss_ac_tid, "c", HOFFSET(s1_t, c), H5T_NATIVE_INT) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Copy wbuf if the library will be modifying it */
     if (mwbuf)
@@ -888,7 +888,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Write s1_wbuf to the dataset with only subset members in ss_tid */
     if (H5Dwrite(did, ss_ac_tid, H5S_ALL, H5S_ALL, dxpl, s1_wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Restore wbuf from backup if the library modified it */
     if (mwbuf)
@@ -896,7 +896,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Read the whole compound back */
     if (H5Dread(did, ss_ac_tid, H5S_ALL, H5S_ALL, dxpl, s1_rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify the compound fields have the correct (old or new) values */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -921,16 +921,16 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create a compound type same size as s1_t */
     if ((ss_bc_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* but contains only subset members of s1_t */
     if (H5Tinsert(ss_bc_tid, "b", HOFFSET(s1_t, b), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(ss_bc_tid, "c", HOFFSET(s1_t, c), H5T_NATIVE_INT) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Read the dataset: will read only what is set in */
     if (H5Dread(did, ss_bc_tid, H5S_ALL, H5S_ALL, dxpl, s1_rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify data read */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -952,13 +952,13 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
      * --1 smaller mem type
      */
     if ((s2_tid = H5Tcreate(H5T_COMPOUND, sizeof(s2_t))) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Tinsert(s2_tid, "a", HOFFSET(s2_t, a), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s2_tid, "b", HOFFSET(s2_t, b), H5T_NATIVE_LONG) < 0 ||
         H5Tinsert(s2_tid, "c", HOFFSET(s2_t, c), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s2_tid, "d", HOFFSET(s2_t, d), H5T_NATIVE_SHORT) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Update s2_wbuf with unique values */
     for (i = 0; i < DSET_SELECT_DIM; i++) {
@@ -973,7 +973,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         memcpy(s2_wbuf_bak, s2_wbuf, sizeof(s2_t) * DSET_SELECT_DIM);
 
     if (H5Dwrite(did, s2_tid, H5S_ALL, H5S_ALL, dxpl, s2_wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Restore wbuf from backup if the library modified it */
     if (mwbuf)
@@ -996,21 +996,21 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
     }
 
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Tclose(s1_tid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Tclose(s2_tid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Tclose(ss_ac_tid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Tclose(ss_bc_tid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Release buffers */
     free(s1_wbuf);
@@ -1111,41 +1111,41 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
     dims[0] = DSET_SELECT_DIM;
 
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Create dataset transfer property list */
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set modify write buffer if requested */
     if (mwbuf)
         if (H5Pset_modify_write_buf(dxpl, true) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     if ((ntrans_dxpl = H5Pcopy(dxpl)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set data transform */
     if (dtrans)
         if (H5Pset_data_transform(dxpl, expr) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     /* Set up file space ids, mem space ids, and dataset ids */
     for (i = 0; i < (int)ndsets; i++) {
         if ((file_sids[i] = H5Screate_simple(1, dims, NULL)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         if ((mem_sids[i] = H5Screate_simple(1, dims, NULL)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Generate dataset name */
         HDsnprintf(dset_names[i], sizeof(dset_names[i]), "multi_dset%d_%s_%s_%s", i,
@@ -1155,31 +1155,31 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
         if ((dset_dids[i] =
                  H5Dcreate2(fid, dset_names[i], ((HDrandom() % 2) ? H5T_NATIVE_LONG : H5T_NATIVE_INT),
                             file_sids[i], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     buf_size = ndsets * DSET_SELECT_DIM * sizeof(int);
 
     /* Allocate buffers for all datasets */
     if (NULL == (total_wbuf = (int *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (mwbuf && NULL == (total_wbuf_bak = (int *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_trans_wbuf = (int *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_rbuf = (int *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     buf_size = ndsets * DSET_SELECT_DIM * sizeof(long);
 
     if (NULL == (total_lwbuf = (long *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (mwbuf && NULL == (total_lwbuf_bak = (long *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_trans_lwbuf = (long *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_lrbuf = (long *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize buffer indices */
     for (i = 0; i < (int)ndsets; i++) {
@@ -1309,19 +1309,19 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
     }
 
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(ntrans_dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     for (i = 0; i < (int)ndsets; i++) {
         if (H5Sclose(file_sids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Sclose(mem_sids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Dclose(dset_dids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     free(total_wbuf);
@@ -1453,41 +1453,41 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create dataset transfer property list */
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set modify write buffer if requested */
     if (mwbuf)
         if (H5Pset_modify_write_buf(dxpl, true) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     dims[0] = DSET_SELECT_DIM;
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Create the memory data type */
     if ((s1_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Tinsert(s1_tid, "a", HOFFSET(s1_t, a), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s1_tid, "b", HOFFSET(s1_t, b), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s1_tid, "c", HOFFSET(s1_t, c), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s1_tid, "d", HOFFSET(s1_t, d), H5T_NATIVE_INT) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     for (i = 0; i < (int)ndsets; i++) {
         if ((file_sids[i] = H5Screate_simple(1, dims, NULL)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if ((mem_sids[i] = H5Screate_simple(1, dims, NULL)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Generate dataset name */
         HDsnprintf(dset_names[i], sizeof(dset_names[i]), "multi_cmpd_dset%d_%s_%s", i,
@@ -1496,7 +1496,7 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         /* Create ith dataset */
         if ((dset_dids[i] =
                  H5Dcreate2(fid, dset_names[i], s1_tid, file_sids[i], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     buf_size    = ndsets * DSET_SELECT_DIM * sizeof(s1_t);
@@ -1579,12 +1579,12 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create a compound type same size as s1_t */
     if ((ss_ac_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* but contains only subset members of s1_t */
     if (H5Tinsert(ss_ac_tid, "a", HOFFSET(s1_t, a), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(ss_ac_tid, "c", HOFFSET(s1_t, c), H5T_NATIVE_INT) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Untouched memory and file spaces for other datasets */
     for (i = 0; i < (int)ndsets; i++) {
@@ -1652,18 +1652,18 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create a compound type same size as s1_t */
     if ((ss_bc_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* but contains only subset members of s1_t */
     if (H5Tinsert(ss_bc_tid, "b", HOFFSET(s1_t, b), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(ss_bc_tid, "c", HOFFSET(s1_t, c), H5T_NATIVE_INT) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Reset memory and file space for <mm> dataset */
     if (H5Sselect_all(mem_sids[mm]) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Sselect_all(file_sids[mm]) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Untouched memory and file space for other datasets */
     for (i = 0; i < (int)ndsets; i++) {
@@ -1726,13 +1726,13 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
      * --1 smaller mem type
      */
     if ((s2_tid = H5Tcreate(H5T_COMPOUND, sizeof(s2_t))) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Tinsert(s2_tid, "a", HOFFSET(s2_t, a), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s2_tid, "b", HOFFSET(s2_t, b), H5T_NATIVE_LONG) < 0 ||
         H5Tinsert(s2_tid, "c", HOFFSET(s2_t, c), H5T_NATIVE_INT) < 0 ||
         H5Tinsert(s2_tid, "d", HOFFSET(s2_t, d), H5T_NATIVE_SHORT) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     for (i = 0; i < (int)ndsets; i++) {
         s2_wbufi[i] = s2_total_wbuf + (i * DSET_SELECT_DIM);
@@ -1784,17 +1784,17 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             }
 
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     for (i = 0; i < (int)ndsets; i++) {
         if (H5Sclose(file_sids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Sclose(mem_sids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Dclose(dset_dids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     free(total_wbuf);
@@ -1894,34 +1894,34 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Create dataset transfer property list */
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Set modify write buffer if requested */
     if (mwbuf)
         if (H5Pset_modify_write_buf(dxpl, true) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
     dims[0] = DSET_SELECT_DIM;
 
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Set up file space ids, mem space ids, and dataset ids */
     for (i = 0; i < (int)ndsets; i++) {
         if ((file_sids[i] = H5Screate_simple(1, dims, NULL)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         if ((mem_sids[i] = H5Screate_simple(1, dims, NULL)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Generate dataset name */
         HDsnprintf(dset_names[i], sizeof(dset_names[i]), "multi_size_dset%d_%s_%s", i,
@@ -1930,7 +1930,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         /* Create ith dataset */
         if ((dset_dids[i] = H5Dcreate2(fid, dset_names[i], H5T_STD_I32BE, file_sids[i], H5P_DEFAULT, dcpl,
                                        H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     /* Case a */
@@ -1940,11 +1940,11 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Allocate buffers for all datasets */
     if (NULL == (total_wbuf = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_wbuf_bak = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_rbuf = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize buffer indices */
     for (i = 0; i < (int)ndsets; i++) {
@@ -2007,11 +2007,11 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Allocate buffers for all datasets */
     if (NULL == (total_lwbuf = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_lwbuf_bak = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_lrbuf = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize buffer indices */
     for (i = 0; i < (int)ndsets; i++) {
@@ -2082,11 +2082,11 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
 
     /* Allocate buffers for all datasets */
     if (NULL == (total_swbuf = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_swbuf_bak = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (NULL == (total_srbuf = (uint8_t *)malloc(buf_size)))
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize buffer indices */
     for (i = 0; i < (int)ndsets; i++) {
@@ -2137,17 +2137,17 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             }
 
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     for (i = 0; i < (int)ndsets; i++) {
         if (H5Sclose(file_sids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Sclose(mem_sids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Dclose(dset_dids[i]) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     free(total_wbuf);
@@ -2327,66 +2327,66 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
 
         /* Create dataset transfer property list */
         if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Enable selection I/O */
         if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Set modify write buffer if requested */
         if (mwbuf)
             if (H5Pset_modify_write_buf(dxpl, true) < 0)
-                FAIL_STACK_ERROR;
+                TEST_ERROR;
 
         /* Set dataset layout: contiguous or chunked */
         dims[0] = DSET_SELECT_DIM;
         if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         if (chunked) {
             cdims[0] = DSET_SELECT_CHUNK_DIM;
             if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-                FAIL_STACK_ERROR;
+                TEST_ERROR;
         }
 
         /* Create compound data type: s1_t  */
         if ((s1_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         if (H5Tinsert(s1_tid, "a", HOFFSET(s1_t, a), H5T_NATIVE_INT) < 0 ||
             H5Tinsert(s1_tid, "b", HOFFSET(s1_t, b), H5T_NATIVE_INT) < 0 ||
             H5Tinsert(s1_tid, "c", HOFFSET(s1_t, c), H5T_NATIVE_INT) < 0 ||
             H5Tinsert(s1_tid, "d", HOFFSET(s1_t, d), H5T_NATIVE_INT) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Create compound data type: s3_t  */
         if ((s3_tid = H5Tcreate(H5T_COMPOUND, sizeof(s3_t))) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         if (H5Tinsert(s3_tid, "a", HOFFSET(s3_t, a), H5T_NATIVE_INT) < 0 ||
             H5Tinsert(s3_tid, "b", HOFFSET(s3_t, b), H5T_NATIVE_INT) < 0 ||
             H5Tinsert(s3_tid, "c", HOFFSET(s3_t, c), H5T_NATIVE_INT) < 0 ||
             H5Tinsert(s3_tid, "d", HOFFSET(s3_t, d), H5T_NATIVE_INT) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Create compound data type: s4_t  */
         if ((s4_tid = H5Tcreate(H5T_COMPOUND, sizeof(s4_t))) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         if (H5Tinsert(s4_tid, "b", HOFFSET(s4_t, b), H5T_NATIVE_UINT) < 0 ||
             H5Tinsert(s4_tid, "d", HOFFSET(s4_t, d), H5T_NATIVE_UINT) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Create dataset for i ndsets */
         for (i = 0; i < (int)ndsets; i++) {
 
             /* File space ids */
             if ((file_sids[i] = H5Screate_simple(1, dims, NULL)) < 0)
-                FAIL_STACK_ERROR;
+                TEST_ERROR;
 
             /* Memory space ids */
             if ((mem_sids[i] = H5Screate_simple(1, dims, NULL)) < 0)
-                FAIL_STACK_ERROR;
+                TEST_ERROR;
 
             mm = HDrandom() % (int)ndsets;
             if (mm == 0) {
@@ -2395,7 +2395,7 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                            chunked ? "chunked" : "contig", mwbuf ? "mwbuf" : "nomwbuf");
                 if ((dset_dids[i] = H5Dcreate2(fid, dset_names[i], H5T_NATIVE_INT, file_sids[i], H5P_DEFAULT,
                                                dcpl, H5P_DEFAULT)) < 0)
-                    FAIL_STACK_ERROR;
+                    TEST_ERROR;
             }
             else if (mm == 1) {
                 dset_types[i] = DSET_WITH_CONV_AND_NO_BKG;
@@ -2403,7 +2403,7 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                            chunked ? "chunked" : "contig", mwbuf ? "mwbuf" : "nomwbuf");
                 if ((dset_dids[i] = H5Dcreate2(fid, dset_names[i], H5T_NATIVE_LONG, file_sids[i], H5P_DEFAULT,
                                                dcpl, H5P_DEFAULT)) < 0)
-                    FAIL_STACK_ERROR;
+                    TEST_ERROR;
             }
             else {
                 dset_types[i] = DSET_WITH_CONV_AND_BKG;
@@ -2411,7 +2411,7 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                            chunked ? "chunked" : "contig", mwbuf ? "mwbuf" : "nomwbuf");
                 if ((dset_dids[i] = H5Dcreate2(fid, dset_names[i], s1_tid, file_sids[i], H5P_DEFAULT, dcpl,
                                                H5P_DEFAULT)) < 0)
-                    FAIL_STACK_ERROR;
+                    TEST_ERROR;
             }
 
         } /* end for i ndsets */
@@ -2421,49 +2421,49 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
         /* DSET_WITH_NO_CONV */
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(int);
         if (NULL == (total_wbuf1 = (int *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (mwbuf && NULL == (total_wbuf1_bak = (int *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (NULL == (total_rbuf1 = (int *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* DSET_WITH_CONV_AND_NO_BKG */
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(unsigned long);
         if (NULL == (ul_total_wbuf2 = (unsigned long *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (mwbuf && NULL == (ul_total_wbuf2_bak = (unsigned long *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(long);
         if (NULL == (l_total_rbuf2 = (long *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(long);
         if (NULL == (l_total_wbuf2 = (long *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (mwbuf && NULL == (l_total_wbuf2_bak = (long *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(short);
         if (NULL == (s_total_rbuf2 = (short *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* DSET_WITH_CONV_AND_BKG */
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(s1_t);
         if (NULL == (s1_total_wbuf3 = (s1_t *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (mwbuf && NULL == (s1_total_wbuf3_bak = (s1_t *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(s3_t);
         if (NULL == (s3_total_rbuf3 = (s3_t *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(s4_t);
         if (NULL == (s4_total_wbuf3 = (s4_t *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (mwbuf && NULL == (s4_total_wbuf3_bak = (s4_t *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         buf_size = ndsets * DSET_SELECT_DIM * sizeof(s1_t);
         if (NULL == (s1_total_rbuf3 = (s1_t *)malloc(buf_size)))
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         /* Test with s settings for ndsets */
         for (s = SETTING_A; s <= SETTING_B; s++) {
@@ -2671,26 +2671,26 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
 
         /* Closing */
         if (H5Pclose(dcpl) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Pclose(dxpl) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         if (H5Tclose(s1_tid) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Tclose(s3_tid) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Tclose(s4_tid) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
 
         for (i = 0; i < (int)ndsets; i++) {
             if (H5Sclose(file_sids[i]) < 0)
-                FAIL_STACK_ERROR;
+                TEST_ERROR;
             if (H5Dclose(dset_dids[i]) < 0)
-                FAIL_STACK_ERROR;
+                TEST_ERROR;
             /* Don't delete the last set of datasets */
             if ((n + 1) != niter)
                 if (H5Ldelete(fid, dset_names[i], H5P_DEFAULT) < 0)
-                    FAIL_STACK_ERROR;
+                    TEST_ERROR;
         }
 
         /* Freeing */
@@ -2833,16 +2833,16 @@ test_set_get_select_io_mode(hid_t fid)
     /* Create 1d data space */
     dims[0] = DSET_SELECT_DIM;
     if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     cdims[0] = DSET_SELECT_CHUNK_DIM;
     if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if ((did = H5Dcreate2(fid, "test_chk_dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize data */
     for (i = 0; i < DSET_SELECT_DIM; i++)
@@ -2850,7 +2850,7 @@ test_set_get_select_io_mode(hid_t fid)
 
     /* May change the selection io actually performed */
     if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pget_selection_io(dxpl, &selection_io_mode) < 0)
         TEST_ERROR;
@@ -2860,13 +2860,13 @@ test_set_get_select_io_mode(hid_t fid)
         TEST_ERROR;
 
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     PASSED();
 
@@ -2924,30 +2924,30 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_
     }
 
     if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Enable page buffering to trigger H5D_PAGE_BUFFER */
     if (test_mode & TEST_PAGE_BUFFER) {
         if (H5Pset_page_buffer_size(fapl, 4096, 0, 0) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
     else {
         /* Not page buffer test, reset to default */
         if (H5Pset_page_buffer_size(fapl, 0, 0, 0) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, 0, (hsize_t)1) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (test_mode & TEST_CONTIGUOUS_SIEVE_BUFFER) {
         no_selection_io_cause_write_expected |= H5D_SEL_IO_CONTIGUOUS_SIEVE_BUFFER;
@@ -2956,14 +2956,14 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_
 
     if (test_mode & TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET) {
         if (H5Pset_layout(dcpl, H5D_COMPACT) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         no_selection_io_cause_write_expected |= H5D_SEL_IO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET;
         no_selection_io_cause_read_expected |= H5D_SEL_IO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET;
     }
 
     if (test_mode == TEST_DATASET_FILTER) {
         if (H5Pset_deflate(dcpl, 9) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         is_chunked = true;
         no_selection_io_cause_write_expected |= H5D_SEL_IO_DATASET_FILTER;
         no_selection_io_cause_read_expected |= H5D_SEL_IO_DATASET_FILTER;
@@ -2977,7 +2977,7 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_
 
     if (test_mode == TEST_DISABLE_BY_API) {
         if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_OFF) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         no_selection_io_cause_write_expected |= H5D_SEL_IO_DISABLE_BY_API;
         no_selection_io_cause_read_expected |= H5D_SEL_IO_DISABLE_BY_API;
     }
@@ -2990,19 +2990,19 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_
     /* Datatype conversion */
     if (test_mode & TEST_DATATYPE_CONVERSION) {
         if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
         tid = H5T_NATIVE_UINT;
 
         /* If we're testing a too small tconv buffer, set the buffer to be too small */
         if (test_mode & TEST_TCONV_BUF_TOO_SMALL) {
             if (H5Pset_buffer(dxpl, sizeof(int), NULL, NULL) < 0)
-                FAIL_STACK_ERROR;
+                TEST_ERROR;
 
             /* If we're using in-place type conversion sel io will succeed and only switch to scalar at the
              * VFL */
             if (test_mode & TEST_IN_PLACE_TCONV) {
                 if (H5Pset_modify_write_buf(dxpl, true) < 0)
-                    FAIL_STACK_ERROR;
+                    TEST_ERROR;
                 no_selection_io_cause_write_expected |= H5D_SEL_IO_NO_VECTOR_OR_SELECTION_IO_CB;
             }
             else
@@ -3026,28 +3026,28 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_
     /* Create 1d data space */
     dims[0] = DSET_SELECT_DIM;
     if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (is_chunked) {
         cdims[0] = DSET_SELECT_CHUNK_DIM;
         if (H5Pset_chunk(dcpl, 1, cdims) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     if ((did = H5Dcreate2(fid, "no_selection_io_cause", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl,
                           H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Initialize data */
     for (i = 0; i < DSET_SELECT_DIM; i++)
         wbuf[i] = i;
 
     if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (test_mode & TEST_CONTIGUOUS_SIEVE_BUFFER) {
         if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     if (H5Pget_no_selection_io_cause(dxpl, &no_selection_io_cause_write) < 0)
@@ -3062,11 +3062,11 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_
         test_mode & TEST_PAGE_BUFFER) {
 
         if (H5Dflush(did) < 0)
-            FAIL_STACK_ERROR;
+            TEST_ERROR;
     }
 
     if (H5Dread(did, tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* Verify causes of no selection I/O for write is as expected */
     if (H5Pget_no_selection_io_cause(dxpl, &no_selection_io_cause_read) < 0)
@@ -3077,20 +3077,20 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_
         TEST_ERROR;
 
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Fclose(fid) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pclose(fcpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     return SUCCEED;
 
@@ -3124,13 +3124,13 @@ test_get_no_selection_io_cause(const char *filename, hid_t fapl)
     TESTING("H5Pget_no_selection_io_cause()");
 
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     if (H5Pget_selection_io(dxpl, &selection_io_mode) < 0)
         TEST_ERROR;
 
     if (H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR;
+        TEST_ERROR;
 
     /* The following tests are based on H5D_SELECTION_IO_MODE_DEFAULT as the
        default setting in the library; skip the tests if that is not true */