diff -r d315a068235a -r 77efe51c6c9a test/array_tests.c
--- a/test/array_tests.c	Tue Sep 24 20:16:00 2019 +0200
+++ b/test/array_tests.c	Thu Oct 03 10:55:39 2019 +0200
@@ -29,58 +29,59 @@
 #include "array_tests.h"
 #include <ucx/utils.h>
 
-UCX_TEST(test_ucx_array_free) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+UCX_TEST(test_ucx_array_destroy) {
+    UcxArray array;
+    ucx_array_init(&array, 16, sizeof(int));
     
     UCX_TEST_BEGIN
     ucx_array_destroy(&array);
-    UCX_TEST_ASSERT(array.data == NULL, "data pointer not NULL after free");
-    UCX_TEST_ASSERT(array.size == 0, "size not zero after free");
-    UCX_TEST_ASSERT(array.capacity == 0, "capacity not zero after free");
+    UCX_TEST_ASSERT(array.data == NULL, "data pointer not NULL after destroy");
+    UCX_TEST_ASSERT(array.size == 0, "size not zero after destroy");
+    UCX_TEST_ASSERT(array.capacity == 0, "capacity not zero after destroy");
     UCX_TEST_ASSERT(array.allocator == ucx_default_allocator(),
-            "allocator corrupted during free");
+            "allocator corrupted during destroy");
     UCX_TEST_END
 }
 
 UCX_TEST(test_ucx_array_new) {
-    UcxArray array = ucx_array_new(16, 47);
+    UcxArray* array = ucx_array_new(16, 47);
     
     UCX_TEST_BEGIN
-    UCX_TEST_ASSERT(array.data, "no memory allocated");
-    UCX_TEST_ASSERT(array.size == 0, "size not initially zero");
-    UCX_TEST_ASSERT(array.capacity == 16, "capacity not as requested");
-    UCX_TEST_ASSERT(array.elemsize == 47, "element size not as requested");
-    UCX_TEST_ASSERT(array.allocator == ucx_default_allocator(),
+    UCX_TEST_ASSERT(array->data, "no memory allocated");
+    UCX_TEST_ASSERT(array->size == 0, "size not initially zero");
+    UCX_TEST_ASSERT(array->capacity == 16, "capacity not as requested");
+    UCX_TEST_ASSERT(array->elemsize == 47, "element size not as requested");
+    UCX_TEST_ASSERT(array->allocator == ucx_default_allocator(),
             "array not using the default allocator");
     UCX_TEST_END
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_append_from) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     int *elements;
     
     int x = 42;
-    ucx_array_append_from(&array, &x, 1);
+    ucx_array_append_from(array, &x, 1);
     UCX_TEST_BEGIN
     
-    elements = array.data;
+    elements = array->data;
     UCX_TEST_ASSERT(elements[0] == 42, "failed");
     
     int y[2] = {13, 37};
-    ucx_array_append_from(&array, y, 2);
+    ucx_array_append_from(array, y, 2);
     
-    elements = array.data;
-    UCX_TEST_ASSERT(array.size == 3, "incorrect size after append");
+    elements = array->data;
+    UCX_TEST_ASSERT(array->size == 3, "incorrect size after append");
     UCX_TEST_ASSERT(elements[1] == 13, "failed");
     UCX_TEST_ASSERT(elements[2] == 37, "failed");
     UCX_TEST_ASSERT(elements[0] == 42,
             "append corrupted previously inserted data");
     
-    ucx_array_append_from(&array, NULL, 2);
+    ucx_array_append_from(array, NULL, 2);
     
-    elements = array.data;
-    UCX_TEST_ASSERT(array.size == 5, "incorrect size after NULL append");
+    elements = array->data;
+    UCX_TEST_ASSERT(array->size == 5, "incorrect size after NULL append");
     UCX_TEST_ASSERT(elements[3] == 0, "element is not zeroed");
     UCX_TEST_ASSERT(elements[4] == 0, "element is not zeroed");
     UCX_TEST_ASSERT(elements[0] == 42,
@@ -92,34 +93,34 @@
     
     UCX_TEST_END
     
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_prepend_from) {
     int *elems;
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     
     int x = 42;
-    ucx_array_prepend_from(&array, &x, 1);
+    ucx_array_prepend_from(array, &x, 1);
     UCX_TEST_BEGIN
     
-    elems = array.data;
+    elems = array->data;
     UCX_TEST_ASSERT(elems[0] == 42, "failed");
     
     int y[2] = {13, 37};
-    ucx_array_prepend_from(&array, y, 2);
+    ucx_array_prepend_from(array, y, 2);
     
-    elems = array.data;
-    UCX_TEST_ASSERT(array.size == 3, "incorrect size after prepend");
+    elems = array->data;
+    UCX_TEST_ASSERT(array->size == 3, "incorrect size after prepend");
     UCX_TEST_ASSERT(elems[0] == 13, "failed");
     UCX_TEST_ASSERT(elems[1] == 37, "failed");
     UCX_TEST_ASSERT(elems[2] == 42,
             "prepend corrupted previously inserted data");
     
-    ucx_array_prepend_from(&array, NULL, 2);
+    ucx_array_prepend_from(array, NULL, 2);
     
-    elems = array.data;
-    UCX_TEST_ASSERT(array.size == 5, "incorrect size after NULL prepend");
+    elems = array->data;
+    UCX_TEST_ASSERT(array->size == 5, "incorrect size after NULL prepend");
     UCX_TEST_ASSERT(elems[0] == 0, "element is not zeroed");
     UCX_TEST_ASSERT(elems[1] == 0, "element is not zeroed");
     UCX_TEST_ASSERT(elems[2] == 13,
@@ -131,59 +132,59 @@
     
     UCX_TEST_END
     
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_set_from) {
     int *elems;
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     
     int x = 42;
 
     UCX_TEST_BEGIN
 
-    ucx_array_set_from(&array, 7, &x, 1);
+    ucx_array_set_from(array, 7, &x, 1);
     
-    elems = array.data;
+    elems = array->data;
     UCX_TEST_ASSERT(elems[7] == 42, "failed");
-    UCX_TEST_ASSERT(array.size >= 8, "array not resized on set");
-    UCX_TEST_ASSERT(array.capacity == 16, "capacity changed unnecessarily");
+    UCX_TEST_ASSERT(array->size >= 8, "array not resized on set");
+    UCX_TEST_ASSERT(array->capacity == 16, "capacity changed unnecessarily");
     
     int y[2] = {13, 37};
-    ucx_array_set_from(&array, 27, y, 2);
+    ucx_array_set_from(array, 27, y, 2);
     
-    elems = array.data;
+    elems = array->data;
     UCX_TEST_ASSERT(elems[27] == 13, "failed");
     UCX_TEST_ASSERT(elems[28] == 37, "failed");
-    UCX_TEST_ASSERT(array.size == 29, "array not resized on set");
-    UCX_TEST_ASSERT(array.capacity == 32, "capacity not grown");
+    UCX_TEST_ASSERT(array->size == 29, "array not resized on set");
+    UCX_TEST_ASSERT(array->capacity == 32, "capacity not grown");
     
-    ucx_array_set_from(&array, 7, NULL, 2);
+    ucx_array_set_from(array, 7, NULL, 2);
     
-    elems = array.data;
+    elems = array->data;
     UCX_TEST_ASSERT(elems[7] == 0, "not zeroed on NULL set");
     UCX_TEST_ASSERT(elems[8] == 0, "not zeroed on NULL set");
     
     UCX_TEST_END
     
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_append) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     int *elements;
     
-    ucx_array_append(&array, 42);
+    ucx_array_append(array, 42);
     UCX_TEST_BEGIN
     
-    elements = array.data;
+    elements = array->data;
     UCX_TEST_ASSERT(elements[0] == 42, "failed");
     
-    ucx_array_append(&array, 13);
-    ucx_array_append(&array, 37);
+    ucx_array_append(array, 13);
+    ucx_array_append(array, 37);
     
-    elements = array.data;
-    UCX_TEST_ASSERT(array.size == 3, "incorrect size after append");
+    elements = array->data;
+    UCX_TEST_ASSERT(array->size == 3, "incorrect size after append");
     UCX_TEST_ASSERT(elements[1] == 13, "failed");
     UCX_TEST_ASSERT(elements[2] == 37, "failed");
     UCX_TEST_ASSERT(elements[0] == 42,
@@ -191,24 +192,24 @@
     
     UCX_TEST_END
     
-    ucx_array_destroy(&array);
+    ucx_array_destroy(array);
 }
 
 UCX_TEST(test_ucx_array_prepend) {
     int *elems;
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     
-    ucx_array_prepend(&array, 42);
+    ucx_array_prepend(array, 42);
     UCX_TEST_BEGIN
     
-    elems = array.data;
+    elems = array->data;
     UCX_TEST_ASSERT(elems[0] == 42, "failed");
     
-    ucx_array_prepend(&array, 37);
-    ucx_array_prepend(&array, 13);
+    ucx_array_prepend(array, 37);
+    ucx_array_prepend(array, 13);
     
-    elems = array.data;
-    UCX_TEST_ASSERT(array.size == 3, "incorrect size after prepend");
+    elems = array->data;
+    UCX_TEST_ASSERT(array->size == 3, "incorrect size after prepend");
     UCX_TEST_ASSERT(elems[0] == 13, "failed");
     UCX_TEST_ASSERT(elems[1] == 37, "failed");
     UCX_TEST_ASSERT(elems[2] == 42,
@@ -216,68 +217,68 @@
     
     UCX_TEST_END
     
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_set) {
     int *elems;
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
 
     UCX_TEST_BEGIN
 
-    ucx_array_set(&array, 7, 42);
+    ucx_array_set(array, 7, 42);
     
-    elems = array.data;
+    elems = array->data;
     UCX_TEST_ASSERT(elems[7] == 42, "failed");
-    UCX_TEST_ASSERT(array.size == 8, "array not resized on set");
-    UCX_TEST_ASSERT(array.capacity == 16, "capacity changed unnecessarily");
+    UCX_TEST_ASSERT(array->size == 8, "array not resized on set");
+    UCX_TEST_ASSERT(array->capacity == 16, "capacity changed unnecessarily");
     
-    ucx_array_set(&array, 27, 13);
-    ucx_array_set(&array, 28, 37);
+    ucx_array_set(array, 27, 13);
+    ucx_array_set(array, 28, 37);
     
-    elems = array.data;
+    elems = array->data;
     UCX_TEST_ASSERT(elems[27] == 13, "failed");
     UCX_TEST_ASSERT(elems[28] == 37, "failed");
-    UCX_TEST_ASSERT(array.size == 29, "array not resized on set");
-    UCX_TEST_ASSERT(array.capacity == 32, "capacity not grown");
+    UCX_TEST_ASSERT(array->size == 29, "array not resized on set");
+    UCX_TEST_ASSERT(array->capacity == 32, "capacity not grown");
         
     UCX_TEST_END
     
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_equals) {
-    UcxArray a1 = ucx_array_new(16, sizeof(int32_t));
-    UcxArray a2 = ucx_array_new(16, sizeof(int32_t));
-    UcxArray a3 = ucx_array_new(16, sizeof(int64_t));
-    UcxArray a4 = ucx_array_new(16, sizeof(int32_t));
+    UcxArray *a1 = ucx_array_new(16, sizeof(int32_t));
+    UcxArray *a2 = ucx_array_new(16, sizeof(int32_t));
+    UcxArray *a3 = ucx_array_new(16, sizeof(int64_t));
+    UcxArray *a4 = ucx_array_new(16, sizeof(int32_t));
     
     int32_t *intelems;
     int64_t *longintelems;
     
-    a1.size = 5;
-    intelems = a1.data;
+    a1->size = 5;
+    intelems = a1->data;
     intelems[0] = 47;
     intelems[1] = 11;
     intelems[2] = 0;
     intelems[3] = 8;
     intelems[4] = 15;
-    a2.size = 5;
-    intelems = a2.data;
+    a2->size = 5;
+    intelems = a2->data;
     intelems[0] = 47;
     intelems[1] = 11;
     intelems[2] = 0;
     intelems[3] = 8;
     intelems[4] = 15;
-    a3.size = 5;
-    longintelems = a3.data;
+    a3->size = 5;
+    longintelems = a3->data;
     longintelems[0] = 47;
     longintelems[1] = 11;
     longintelems[2] = 0;
     longintelems[3] = 8;
     longintelems[4] = 15;
-    a4.size = 5;
-    intelems = a4.data;
+    a4->size = 5;
+    intelems = a4->data;
     intelems[0] = 47;
     intelems[1] = 11;
     intelems[2] = -6;
@@ -300,54 +301,54 @@
             "compare using memcmp() failed");
     
     UCX_TEST_END
-    ucx_array_destroy(&a1);
-    ucx_array_destroy(&a2);
-    ucx_array_destroy(&a3);
-    ucx_array_destroy(&a4);
+    ucx_array_free(a1);
+    ucx_array_free(a2);
+    ucx_array_free(a3);
+    ucx_array_free(a4);
 }
 
 UCX_TEST(test_ucx_array_concat) {
-    UcxArray a1 = ucx_array_new(16, sizeof(int));
-    UcxArray a2 = ucx_array_new(16, sizeof(int));
+    UcxArray *a1 = ucx_array_new(16, sizeof(int));
+    UcxArray *a2 = ucx_array_new(16, sizeof(int));
     int *elems;
     
-    a1.size = 2;
-    elems = a1.data;
+    a1->size = 2;
+    elems = a1->data;
     elems[0] = 47;
     elems[1] = 11;
-    a2.size = 3;
-    elems = a2.data;
+    a2->size = 3;
+    elems = a2->data;
     elems[0] = 0;
     elems[1] = 8;
     elems[2] = 15;
     
     UCX_TEST_BEGIN
     
-    UCX_TEST_ASSERT(!ucx_array_concat(&a1, &a2), "failed");
-    UCX_TEST_ASSERT(a1.size == 5, "failed");
-    elems = a1.data;
+    UCX_TEST_ASSERT(!ucx_array_concat(a1, a2), "failed");
+    UCX_TEST_ASSERT(a1->size == 5, "failed");
+    elems = a1->data;
     UCX_TEST_ASSERT(elems[0] == 47, "failed");
     UCX_TEST_ASSERT(elems[1] == 11, "failed");
     UCX_TEST_ASSERT(elems[2] == 0, "failed");
     UCX_TEST_ASSERT(elems[3] == 8, "failed");
     UCX_TEST_ASSERT(elems[4] == 15, "failed");
     
-    a1.elemsize *= 2;
-    UCX_TEST_ASSERT(ucx_array_concat(&a1, &a2),
+    a1->elemsize *= 2;
+    UCX_TEST_ASSERT(ucx_array_concat(a1, a2),
             "arrays of different element size must not be concatenated");
-    UCX_TEST_ASSERT(a1.size == 5,
+    UCX_TEST_ASSERT(a1->size == 5,
             "arrays of different element size must not be concatenated");
     
     UCX_TEST_END
-    ucx_array_destroy(&a1);
-    ucx_array_destroy(&a2);    
+    ucx_array_free(a1);
+    ucx_array_free(a2);    
 }
 
 UCX_TEST(test_ucx_array_at) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     
     int x[3] = {42, 13, 5};
-    ucx_array_append_from(&array, x, 3);
+    ucx_array_append_from(array, x, 3);
     
     UCX_TEST_BEGIN
     
@@ -360,15 +361,15 @@
     
     UCX_TEST_END
     
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_find) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     int *elems;
     
-    array.size = 5;
-    elems = array.data;
+    array->size = 5;
+    elems = array->data;
     elems[0] = 47;
     elems[1] = 11;
     elems[2] = 0;
@@ -391,15 +392,15 @@
         "failed using memcmp()");
     
     UCX_TEST_END
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_contains) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     int *elems;
     
-    array.size = 5;
-    elems = array.data;
+    array->size = 5;
+    elems = array->data;
     elems[0] = 47;
     elems[1] = 11;
     elems[2] = 0;
@@ -422,15 +423,15 @@
         "false positive using memcmp()");
     
     UCX_TEST_END
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_remove) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     int *elems;
     
-    array.size = 5;
-    elems = array.data;
+    array->size = 5;
+    elems = array->data;
     elems[0] = 47;
     elems[1] = 11;
     elems[2] = 0;
@@ -439,31 +440,33 @@
         
     UCX_TEST_BEGIN
     
-    ucx_array_remove(&array, 2);
-    elems = array.data;
+    ucx_array_remove(array, 2);
+    elems = array->data;
     UCX_TEST_ASSERT(
             elems[0] == 47 &&
             elems[1] == 11 &&
             elems[2] == 8 &&
             elems[3] == 15,
             "wrong contents after remove");
-    UCX_TEST_ASSERT(array.size == 4, "wrong size after remove");
+    UCX_TEST_ASSERT(array->size == 4, "wrong size after remove");
     
-    ucx_array_remove_fast(&array, 1);
-    elems = array.data;
+    ucx_array_remove_fast(array, 1);
+    elems = array->data;
     UCX_TEST_ASSERT(
             elems[0] == 47 &&
             elems[1] == 15 &&
             elems[2] == 8,
             "wrong contents after fast remove");
-    UCX_TEST_ASSERT(array.size == 3, "wrong size after fast remove");
+    UCX_TEST_ASSERT(array->size == 3, "wrong size after fast remove");
     
     UCX_TEST_END
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_clone) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray array;
+    UcxArray copy;
+    ucx_array_init(&array, 16, sizeof(int));
     int *elems;
     
     array.size = 5;
@@ -474,7 +477,7 @@
     elems[3] = 8;
     elems[4] = 15;
     
-    UcxArray copy = ucx_array_clone(array);
+    ucx_array_clone(&copy, &array);
     UCX_TEST_BEGIN
 
     UCX_TEST_ASSERT(array.data != copy.data, "no true copy");
@@ -482,7 +485,8 @@
     UCX_TEST_ASSERT(array.capacity == copy.capacity, "capacity mismatch");
     UCX_TEST_ASSERT(array.elemsize == copy.elemsize, "element size mismatch");
     UCX_TEST_ASSERT(array.allocator == copy.allocator, "allocator mismatch");
-    UCX_TEST_ASSERT(ucx_array_equals(array, copy, ucx_cmp_int, NULL), "failed");
+    UCX_TEST_ASSERT(ucx_array_equals(&array, &copy, ucx_cmp_int, NULL),
+            "contents do not match after clone");
     
     UCX_TEST_END
 
@@ -497,27 +501,27 @@
 UCX_TEST(test_ucx_array_sort) {
     int *elems;
 
-    UcxArray array = ucx_array_new(16, sizeof(int));    
-    array.size = 5;
-    elems = array.data;
+    UcxArray *array = ucx_array_new(16, sizeof(int));    
+    array->size = 5;
+    elems = array->data;
     elems[0] = 47;
     elems[1] = 11;
     elems[2] = 0;
     elems[3] = 8;
     elems[4] = 15;
     
-    UcxArray expected = ucx_array_new(16, sizeof(int));
-    expected.size = 5;
-    elems = expected.data;
+    UcxArray *expected = ucx_array_new(16, sizeof(int));
+    expected->size = 5;
+    elems = expected->data;
     elems[0] = 0;
     elems[1] = 8;
     elems[2] = 11;
     elems[3] = 15;
     elems[4] = 47;
     
-    UcxArray expectedrev = ucx_array_new(16, sizeof(int));
-    expectedrev.size = 5;
-    elems = expectedrev.data;
+    UcxArray *expectedrev = ucx_array_new(16, sizeof(int));
+    expectedrev->size = 5;
+    elems = expectedrev->data;
     elems[0] = 47;
     elems[1] = 15;
     elems[2] = 11;
@@ -526,101 +530,102 @@
     
 
     UCX_TEST_BEGIN
-    void* original_ptr = array.data;
+    void* original_ptr = array->data;
     ucx_array_sort(array, ucx_cmp_int, NULL);
     UCX_TEST_ASSERT(ucx_array_equals(array, expected, NULL, NULL), "failed");
-    UCX_TEST_ASSERT(array.size == 5, "size corrupted");
-    UCX_TEST_ASSERT(array.data == original_ptr, "shall not reallocate");
+    UCX_TEST_ASSERT(array->size == 5, "size corrupted");
+    UCX_TEST_ASSERT(array->data == original_ptr, "shall not reallocate");
     
     ucx_array_sort(array, ucx_cmp_int_reverse, NULL);
     UCX_TEST_ASSERT(ucx_array_equals(array, expectedrev, NULL, NULL), "failed");
 
-    ucx_array_reserve(&array, 32);
-    ucx_array_reserve(&expected, 32);
-    array.size = expected.size = 32;
+    ucx_array_reserve(array, 32);
+    ucx_array_reserve(expected, 32);
+    array->size = expected->size = 32;
     for (size_t i = 0 ; i < 32 ; i++) {
-        ((int*)array.data)[i]= ((i%2==0)?-1:1) * ((int) i);
-        ((int*)expected.data)[i] = (-30+2*i) - (i > 15 ? 1 : 0);
+        ((int*)array->data)[i]= ((i%2==0)?-1:1) * ((int) i);
+        ((int*)expected->data)[i] = (-30+2*i) - (i > 15 ? 1 : 0);
     }
     
     /* dummy third argument to trigger a possible fallback for qsort_s */
-    ucx_array_sort(array, ucx_cmp_int, array.data);
+    ucx_array_sort(array, ucx_cmp_int, array->data);
     UCX_TEST_ASSERT(ucx_array_equals(array, expected, NULL, NULL),
             "failed for bigger arrays");
     UCX_TEST_END
 
-    ucx_array_destroy(&expected);
-    ucx_array_destroy(&array);
+    ucx_array_free(expectedrev);
+    ucx_array_free(expected);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_autogrow) {
     int *elems;
-    UcxArray array = ucx_array_new(4, sizeof(int));
-    array.size = 3;
-    elems = array.data;
+    UcxArray *array = ucx_array_new(4, sizeof(int));
+    array->size = 3;
+    elems = array->data;
     elems[0] = 47;
     elems[1] = 11;
     int x = 5;
     
     UCX_TEST_BEGIN
 
-    void* oldptr = array.data;
+    void* oldptr = array->data;
     
-    ucx_array_append(&array, 5);
-    UCX_TEST_ASSERT(array.capacity == 4 && array.data == oldptr,
+    ucx_array_append(array, 5);
+    UCX_TEST_ASSERT(array->capacity == 4 && array->data == oldptr,
             "array should not grow too early");
-    ucx_array_append(&array, 5);
-    elems = array.data;
-    UCX_TEST_ASSERT(array.capacity == 8, "array did not grow");
-    UCX_TEST_ASSERT(array.size == 5, "incorrect size after grow");
+    ucx_array_append(array, 5);
+    elems = array->data;
+    UCX_TEST_ASSERT(array->capacity == 8, "array did not grow");
+    UCX_TEST_ASSERT(array->size == 5, "incorrect size after grow");
     UCX_TEST_ASSERT(elems[3] == 5 && elems[4] == 5, "corrupt data");
     
     UCX_TEST_END
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_shrink) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
-    array.size = 4;
+    UcxArray *array = ucx_array_new(16, sizeof(int));
+    array->size = 4;
     
     UCX_TEST_BEGIN
-    UCX_TEST_ASSERT(!ucx_array_shrink(&array), "failed");
-    UCX_TEST_ASSERT(array.capacity == 4, "incorrect capacity after shrink");
+    UCX_TEST_ASSERT(!ucx_array_shrink(array), "failed");
+    UCX_TEST_ASSERT(array->capacity == 4, "incorrect capacity after shrink");
     UCX_TEST_END
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_resize) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
-    array.size = 8;
+    UcxArray *array = ucx_array_new(16, sizeof(int));
+    array->size = 8;
     
     UCX_TEST_BEGIN
 
-    UCX_TEST_ASSERT(!ucx_array_resize(&array, 32), "failed");
-    UCX_TEST_ASSERT(array.capacity == 32, "incorrect capacity after resize");
-    UCX_TEST_ASSERT(array.size == 8, "incorrect size after resize");
+    UCX_TEST_ASSERT(!ucx_array_resize(array, 32), "failed");
+    UCX_TEST_ASSERT(array->capacity == 32, "incorrect capacity after resize");
+    UCX_TEST_ASSERT(array->size == 8, "incorrect size after resize");
     
-    UCX_TEST_ASSERT(!ucx_array_resize(&array, 4), "failed");
-    UCX_TEST_ASSERT(array.capacity == 4, "incorrect capacity after resize");
-    UCX_TEST_ASSERT(array.size == 4, "incorrect size after resize");
+    UCX_TEST_ASSERT(!ucx_array_resize(array, 4), "failed");
+    UCX_TEST_ASSERT(array->capacity == 4, "incorrect capacity after resize");
+    UCX_TEST_ASSERT(array->size == 4, "incorrect size after resize");
     
     UCX_TEST_END
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_reserve) {
-    UcxArray array = ucx_array_new(16, sizeof(int));
+    UcxArray *array = ucx_array_new(16, sizeof(int));
     
     UCX_TEST_BEGIN
 
-    UCX_TEST_ASSERT(!ucx_array_reserve(&array, 4), "failed");
-    UCX_TEST_ASSERT(array.capacity == 16, "reserve shall not shrink");
+    UCX_TEST_ASSERT(!ucx_array_reserve(array, 4), "failed");
+    UCX_TEST_ASSERT(array->capacity == 16, "reserve shall not shrink");
             
-    UCX_TEST_ASSERT(!ucx_array_resize(&array, 32), "failed");
-    UCX_TEST_ASSERT(array.capacity == 32, "incorrect capacity after reserve");    
+    UCX_TEST_ASSERT(!ucx_array_resize(array, 32), "failed");
+    UCX_TEST_ASSERT(array->capacity == 32, "incorrect capacity after reserve");    
     
     UCX_TEST_END
-    ucx_array_destroy(&array);
+    ucx_array_free(array);
 }
 
 UCX_TEST(test_ucx_array_util_set) {