diff -r 3d999ea3f780 -r 4477987d40cd test/avl_tests.c
--- a/test/avl_tests.c	Mon May 18 20:39:04 2015 +0200
+++ b/test/avl_tests.c	Tue May 19 16:47:54 2015 +0200
@@ -157,19 +157,21 @@
     ucx_avl_put(tree1, 2, (char*)data2);
     ucx_avl_put(tree1, 1, (char*)data1);
     ucx_avl_put(tree1, 3, (char*)data3);
-    void *val = ucx_avl_remove(tree1, 3);
+    void *val;
+    ucx_avl_remove_s(tree1, 3, NULL, &val);
     
     UCX_TEST_ASSERT(check_tree(tree1->root), "check_tree failed (tree1)");
-    UCX_TEST_ASSERT(
-            val == data3,
+    UCX_TEST_ASSERT(val == data3,
             "wrong return value for key: 1 (tree1)");
     UCX_TEST_ASSERT(ucx_avl_get(tree1, 3) == NULL, "value not removed (tree1)");
-    UCX_TEST_ASSERT(
-            ucx_avl_remove(tree1, 2) == data2,
+    
+    ucx_avl_remove_s(tree1, 2, NULL, &val);
+    UCX_TEST_ASSERT(val == data2,
             "wrong return value for key: 2 (tree1)");
     UCX_TEST_ASSERT(check_tree(tree1->root), "check_tree failed (tree1)");
-    UCX_TEST_ASSERT(
-            ucx_avl_remove(tree1, 1) == data1,
+    
+    ucx_avl_remove_s(tree1, 1, NULL, &val);
+    UCX_TEST_ASSERT(val == data1,
             "wrong return value for key: 1 (tree1)");
     UCX_TEST_ASSERT(check_tree(tree1->root), "check_tree failed (tree1)");
     UCX_TEST_ASSERT(tree1->root == NULL, "root not NULL (tree1)");
@@ -185,13 +187,13 @@
         }
     }
     
-    UCX_TEST_ASSERT(
-            ucx_avl_remove(tree2, 10) == data3,
+    ucx_avl_remove_s(tree2, 10, NULL, &val);
+    UCX_TEST_ASSERT(val == data3,
             "wrong return value for key: 10 (tree2)");
     UCX_TEST_ASSERT(check_tree(tree2->root), "check_tree failed (tree2)");
     
-    UCX_TEST_ASSERT(
-            ucx_avl_remove(tree2, 15) == data2,
+    ucx_avl_remove_s(tree2, 15, NULL, &val);
+    UCX_TEST_ASSERT(val == data2,
             "wrong return value for key: 15 (tree2)");
     UCX_TEST_ASSERT(check_tree(tree2->root), "check_tree failed (tree2)");