Index: src/tests/.expect/avl_test.txt
===================================================================
--- src/tests/.expect/avl_test.txt	(revision 14d2bdfe5b0ca66a20e4680e0a31eae02e382786)
+++ src/tests/.expect/avl_test.txt	(revision 4b5857f29af8ca2fba7212476436be73f8de9118)
@@ -1,86 +1,2 @@
-/usr/local/bin/cfa -DHAVE_CONFIG_H -I. -I../..     -g -Wall -Wno-unused-function  -MT avl_test.o -MD -MP -MF .deps/avl_test.Tpo -c -o avl_test.o `test -f 'avltree/avl_test.c' || echo './'`avltree/avl_test.c
-/usr/local/bin/cfa -DHAVE_CONFIG_H -I. -I../..     -g -Wall -Wno-unused-function  -MT avl0.o -MD -MP -MF .deps/avl0.Tpo -c -o avl0.o `test -f 'avltree/avl0.c' || echo './'`avltree/avl0.c
-/usr/local/bin/cfa -DHAVE_CONFIG_H -I. -I../..     -g -Wall -Wno-unused-function  -MT avl1.o -MD -MP -MF .deps/avl1.Tpo -c -o avl1.o `test -f 'avltree/avl1.c' || echo './'`avltree/avl1.c
-/usr/local/bin/cfa -DHAVE_CONFIG_H -I. -I../..     -g -Wall -Wno-unused-function  -MT avl2.o -MD -MP -MF .deps/avl2.Tpo -c -o avl2.o `test -f 'avltree/avl2.c' || echo './'`avltree/avl2.c
-/usr/local/bin/cfa -DHAVE_CONFIG_H -I. -I../..     -g -Wall -Wno-unused-function  -MT avl3.o -MD -MP -MF .deps/avl3.Tpo -c -o avl3.o `test -f 'avltree/avl3.c' || echo './'`avltree/avl3.c
-/usr/local/bin/cfa -DHAVE_CONFIG_H -I. -I../..     -g -Wall -Wno-unused-function  -MT avl4.o -MD -MP -MF .deps/avl4.Tpo -c -o avl4.o `test -f 'avltree/avl4.c' || echo './'`avltree/avl4.c
-/usr/local/bin/cfa -DHAVE_CONFIG_H -I. -I../..     -g -Wall -Wno-unused-function  -MT avl-private.o -MD -MP -MF .deps/avl-private.Tpo -c -o avl-private.o `test -f 'avltree/avl-private.c' || echo './'`avltree/avl-private.c
-CFA Version 1.0.0 (debug)
-CFA Version 1.0.0 (debug)
-CFA Version 1.0.0 (debug)
-CFA Version 1.0.0 (debug)
-CFA Version 1.0.0 (debug)
-CFA Version 1.0.0 (debug)
-CFA Version 1.0.0 (debug)
-mv -f .deps/avl0.Tpo .deps/avl0.Po
-/tmp/cck003yV.i: In function 'main':
-/tmp/cck003yV.i:1222:24: warning: passing argument 20 of '__create__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__FP5stree_t0t1__1' discards 'const' qualifier from pointer target type [enabled by default]
-     ((void)((*((struct _conc_tree0 **)(&__imap__P5stree_2)))=((_tmp_cp_ret0=__create__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__FP5stree_t0t1__1(_adapterF_Pii__MP, _adapterFi_Pii_P_MP, _adapterFi_ii_M_PP, _adapterF_Pii__MP, _adapterFi_Pii_P_MP, sizeof(int ), __alignof__(int ), sizeof(int ), __alignof__(int ), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), ((int (*)(void *, void *))___operator_less__Fi_ii_intrinsic___1), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), (&_temp4), (&___constant_zero__Ciintrinsic___1))) , _tmp_cp_ret0)) /* ?{} */);
-                        ^
-/tmp/cck003yV.i:1188:7: note: expected 'void *' but argument is of type 'const int *'
- void *__create__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__FP5stree_t0t1__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void *__key__2tK_1, void *__value__2tV_1);
-       ^
-/tmp/cck003yV.i:1229:5: warning: passing argument 19 of '__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret1=__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(_adapterF_Pii__MP, _adapterFi_Pii_P_MP, _adapterFi_ii_M_PP, _adapterF_Pii__MP, _adapterFi_Pii_P_MP, sizeof(int ), __alignof__(int ), sizeof(int ), __alignof__(int ), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), ((int (*)(void *, void *))___operator_less__Fi_ii_intrinsic___1), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), (&__imap__P5stree_2), (&_temp5), (&_temp6))) , _tmp_cp_ret1));
-     ^
-/tmp/cck003yV.i:1191:5: note: expected 'void **' but argument is of type 'struct _conc_tree0 **'
- int __insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1, void *__value__2tV_1);
-     ^
-/tmp/cck003yV.i:1236:5: warning: passing argument 19 of '__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret2=__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(_adapterF_Pii__MP, _adapterFi_Pii_P_MP, _adapterFi_ii_M_PP, _adapterF_Pii__MP, _adapterFi_Pii_P_MP, sizeof(int ), __alignof__(int ), sizeof(int ), __alignof__(int ), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), ((int (*)(void *, void *))___operator_less__Fi_ii_intrinsic___1), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), (&__imap__P5stree_2), (&_temp7), (&_temp8))) , _tmp_cp_ret2));
-     ^
-/tmp/cck003yV.i:1191:5: note: expected 'void **' but argument is of type 'struct _conc_tree0 **'
- int __insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1, void *__value__2tV_1);
-     ^
-/tmp/cck003yV.i:1267:5: warning: passing argument 19 of '__remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret9=__remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1(_adapterF_Pii__MP, _adapterFi_Pii_P_MP, _adapterFi_ii_M_PP, _adapterF_Pii__MP, _adapterFi_Pii_P_MP, sizeof(int ), __alignof__(int ), sizeof(int ), __alignof__(int ), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), ((int (*)(void *, void *))___operator_less__Fi_ii_intrinsic___1), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), (&__imap__P5stree_2), (&_temp12))) , _tmp_cp_ret9));
-     ^
-/tmp/cck003yV.i:1192:5: note: expected 'void **' but argument is of type 'struct _conc_tree0 **'
- int __remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1);
-     ^
-/tmp/cck003yV.i:1324:5: warning: passing argument 19 of '__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret11=__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(_adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, _adapterFi_ii_M_PP, _adapterF_Pii__MP, _adapterFi_Pii_P_MP, sizeof(int ), __alignof__(int ), sizeof(char *), __alignof__(char *), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), ((int (*)(void *, void *))___operator_less__Fi_ii_intrinsic___1), ((void *(*)(void *, void *))(&_thunk5)), ((void (*)(void *))(&_thunk6)), ((void (*)(void *, void *))(&_thunk7)), ((void (*)(void *))(&_thunk8)), (&__smap__P5stree_2), (&_temp15), (&_temp16))) , _tmp_cp_ret11));
-     ^
-/tmp/cck003yV.i:1191:5: note: expected 'void **' but argument is of type 'struct _conc_tree1 **'
- int __insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1, void *__value__2tV_1);
-     ^
-/tmp/cck003yV.i:1343:5: warning: passing argument 19 of '__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret12=__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(_adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, _adapterFi_ii_M_PP, _adapterF_Pii__MP, _adapterFi_Pii_P_MP, sizeof(int ), __alignof__(int ), sizeof(char *), __alignof__(char *), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), ((int (*)(void *, void *))___operator_less__Fi_ii_intrinsic___1), ((void *(*)(void *, void *))(&_thunk9)), ((void (*)(void *))(&_thunk10)), ((void (*)(void *, void *))(&_thunk11)), ((void (*)(void *))(&_thunk12)), (&__smap__P5stree_2), (&_temp17), (&_temp18))) , _tmp_cp_ret12));
-     ^
-/tmp/cck003yV.i:1191:5: note: expected 'void **' but argument is of type 'struct _conc_tree1 **'
- int __insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1, void *__value__2tV_1);
-     ^
-/tmp/cck003yV.i:1470:5: warning: passing argument 19 of '__remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret19=__remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1(_adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, _adapterFi_ii_M_PP, _adapterF_Pii__MP, _adapterFi_Pii_P_MP, sizeof(int ), __alignof__(int ), sizeof(char *), __alignof__(char *), ((void *(*)(void *, void *))___operator_assign__Fi_Pii_intrinsic___1), ((void (*)(void *))___constructor__F_Pi_intrinsic___1), ((void (*)(void *, void *))___constructor__F_Pii_intrinsic___1), ((void (*)(void *))___destructor__F_Pi_intrinsic___1), ((int (*)(void *, void *))___operator_less__Fi_ii_intrinsic___1), ((void *(*)(void *, void *))(&_thunk41)), ((void (*)(void *))(&_thunk42)), ((void (*)(void *, void *))(&_thunk43)), ((void (*)(void *))(&_thunk44)), (&__smap__P5stree_2), (&_temp22))) , _tmp_cp_ret19));
-     ^
-/tmp/cck003yV.i:1192:5: note: expected 'void **' but argument is of type 'struct _conc_tree1 **'
- int __remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1);
-     ^
-/tmp/cck003yV.i:1567:5: warning: passing argument 19 of '__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret22=__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(_adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, _adapterFi_PcPc_M_PP, _adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, sizeof(char *), __alignof__(char *), sizeof(char *), __alignof__(char *), ((void *(*)(void *, void *))(&_thunk58)), ((void (*)(void *))(&_thunk59)), ((void (*)(void *, void *))(&_thunk60)), ((void (*)(void *))(&_thunk61)), ((int (*)(void *, void *))___operator_less__Fi_PcPc__2), ((void *(*)(void *, void *))(&_thunk62)), ((void (*)(void *))(&_thunk63)), ((void (*)(void *, void *))(&_thunk64)), ((void (*)(void *))(&_thunk65)), (&__ssmap__P5stree_2), (&_temp25), (&_temp26))) , _tmp_cp_ret22));
-     ^
-/tmp/cck003yV.i:1191:5: note: expected 'void **' but argument is of type 'struct _conc_tree2 **'
- int __insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1, void *__value__2tV_1);
-     ^
-/tmp/cck003yV.i:1598:5: warning: passing argument 19 of '__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret23=__insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(_adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, _adapterFi_PcPc_M_PP, _adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, sizeof(char *), __alignof__(char *), sizeof(char *), __alignof__(char *), ((void *(*)(void *, void *))(&_thunk66)), ((void (*)(void *))(&_thunk67)), ((void (*)(void *, void *))(&_thunk68)), ((void (*)(void *))(&_thunk69)), ((int (*)(void *, void *))___operator_less__Fi_PcPc__2), ((void *(*)(void *, void *))(&_thunk70)), ((void (*)(void *))(&_thunk71)), ((void (*)(void *, void *))(&_thunk72)), ((void (*)(void *))(&_thunk73)), (&__ssmap__P5stree_2), (&_temp27), (&_temp28))) , _tmp_cp_ret23));
-     ^
-/tmp/cck003yV.i:1191:5: note: expected 'void **' but argument is of type 'struct _conc_tree2 **'
- int __insert__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0t1__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1, void *__value__2tV_1);
-     ^
-/tmp/cck003yV.i:1785:5: warning: passing argument 19 of '__remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1' from incompatible pointer type [enabled by default]
-     ((void)((_tmp_cp_ret30=__remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1(_adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, _adapterFi_PcPc_M_PP, _adapterF_PPcPc__MP, _adapterFPc_PPcPc_P_MP, sizeof(char *), __alignof__(char *), sizeof(char *), __alignof__(char *), ((void *(*)(void *, void *))(&_thunk118)), ((void (*)(void *))(&_thunk119)), ((void (*)(void *, void *))(&_thunk120)), ((void (*)(void *))(&_thunk121)), ((int (*)(void *, void *))___operator_less__Fi_PcPc__2), ((void *(*)(void *, void *))(&_thunk122)), ((void (*)(void *))(&_thunk123)), ((void (*)(void *, void *))(&_thunk124)), ((void (*)(void *))(&_thunk125)), (&__ssmap__P5stree_2), (&_temp32))) , _tmp_cp_ret30));
-     ^
-/tmp/cck003yV.i:1192:5: note: expected 'void **' but argument is of type 'struct _conc_tree2 **'
- int __remove__A2_0_0____operator_assign__PFt0_Pt0t0____constructor__PF_Pt0____constructor__PF_Pt0t0____destructor__PF_Pt0____operator_less__PFi_t0t0____operator_assign__PFt1_Pt1t1____constructor__PF_Pt1____constructor__PF_Pt1t1____destructor__PF_Pt1__Fi_PP5street0__1(void (*_adapterF_P2tV2tV__MP)(void (*)(), void *, void *), void (*_adapterF2tV_P2tV2tV_P_MP)(void (*)(), void *, void *, void *), int (*_adapterFi_2tK2tK_M_PP)(void (*)(), void *, void *), void (*_adapterF_P2tK2tK__MP)(void (*)(), void *, void *), void (*_adapterF2tK_P2tK2tK_P_MP)(void (*)(), void *, void *, void *), long unsigned int _sizeof_2tK, long unsigned int _alignof_2tK, long unsigned int _sizeof_2tV, long unsigned int _alignof_2tV, void *(*___operator_assign__PF2tK_P2tK2tK__1)(void *, void *), void (*___constructor__PF_P2tK__1)(void *), void (*___constructor__PF_P2tK2tK__1)(void *, void *), void (*___destructor__PF_P2tK__1)(void *), int (*___operator_less__PFi_2tK2tK__1)(void *, void *), void *(*___operator_assign__PF2tV_P2tV2tV__1)(void *, void *), void (*___constructor__PF_P2tV__1)(void *), void (*___constructor__PF_P2tV2tV__1)(void *, void *), void (*___destructor__PF_P2tV__1)(void *), void **__t__PP5stree_1, void *__key__2tK_1);
-     ^
-mv -f .deps/avl1.Tpo .deps/avl1.Po
-mv -f .deps/avl_test.Tpo .deps/avl_test.Po
-mv -f .deps/avl4.Tpo .deps/avl4.Po
-mv -f .deps/avl2.Tpo .deps/avl2.Po
-mv -f .deps/avl3.Tpo .deps/avl3.Po
-mv -f .deps/avl-private.Tpo .deps/avl-private.Po
-/usr/local/bin/cfa  -g -Wall -Wno-unused-function    -o avl_test avl_test.o avl0.o avl1.o avl2.o avl3.o avl4.o avl-private.o  
-CFA Version 1.0.0 (debug)
 3 13 0
 foo bar baz
Index: src/tests/runTests.sh
===================================================================
--- src/tests/runTests.sh	(revision 14d2bdfe5b0ca66a20e4680e0a31eae02e382786)
+++ src/tests/runTests.sh	(revision 4b5857f29af8ca2fba7212476436be73f8de9118)
@@ -67,5 +67,5 @@
 tests="vector_test avl_test"
 
-# python test.py ${tests}
+python test.py ${tests}
 
 ret_val=0
Index: src/tests/test.py
===================================================================
--- src/tests/test.py	(revision 14d2bdfe5b0ca66a20e4680e0a31eae02e382786)
+++ src/tests/test.py	(revision 4b5857f29af8ca2fba7212476436be73f8de9118)
@@ -40,5 +40,5 @@
 
 	# build, skipping to next test on error
-	make_ret = sh("make -j 1 %s > %s 2>&1" % (test, out_file), dry_run)
+	make_ret = sh("make -j 8 %s > %s 2>&1" % (test, out_file), dry_run)
 
 	if make_ret == 0 :
