Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision 7fe4cc3e3914f3250805dab2096831d4687ca914)
+++ src/InitTweak/FixInit.cc	(revision d32c4e295f91b7b5d9ffc75dd2c9e23529a5c41d)
@@ -449,5 +449,5 @@
 						FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + "_dtor_atexit", DeclarationNode::NoStorageClass, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
 						dtorCaller->fixUniqueId();
-						dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor() );
+						dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor()->clone() );
 
 						// on_exit(dtor_atexit);
Index: src/libcfa/containers/vector
===================================================================
--- src/libcfa/containers/vector	(revision 7fe4cc3e3914f3250805dab2096831d4687ca914)
+++ src/libcfa/containers/vector	(revision d32c4e295f91b7b5d9ffc75dd2c9e23529a5c41d)
@@ -40,5 +40,5 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline bool size(vector(T, allocator_t) *const this)
+static inline size_t size(vector(T, allocator_t) *const this)
 {
 	return this->size;
Index: src/tests/.expect/libcfa_vector.txt
===================================================================
--- src/tests/.expect/libcfa_vector.txt	(revision 7fe4cc3e3914f3250805dab2096831d4687ca914)
+++ src/tests/.expect/libcfa_vector.txt	(revision d32c4e295f91b7b5d9ffc75dd2c9e23529a5c41d)
@@ -1,6 +1,5 @@
-CFA Version 1.0.0 (debug)
-libcfa_vector.c:3:29: fatal error: containers/vector: No such file or directory
- #include <containers/vector>
-                             ^
-compilation terminated.
-make: *** [libcfa_vector] Error 1
+0
+1
+2
+3
+0
Index: src/tests/libcfa_vector.c
===================================================================
--- src/tests/libcfa_vector.c	(revision 7fe4cc3e3914f3250805dab2096831d4687ca914)
+++ src/tests/libcfa_vector.c	(revision d32c4e295f91b7b5d9ffc75dd2c9e23529a5c41d)
@@ -1,21 +1,42 @@
 #include <stdlib>
+
+extern "C" {
+	#include <stdio.h>
+}
 
 #include <containers/vector>
 
+#define assert(x) do {\
+	if(!(x)) {\
+		printf("CHECK failed : %s at %s:%i\n", #x, __FILE__, __LINE__);\
+		abort();\
+	}}while(0 == 1)\
+
 int main(int argc, char const *argv[]) {
-	vector(int) iv;
+	vector(int, heap_allocator(int)) iv;
+	ctor(&iv);
+
+	assert(empty(&iv));
+	assert(size(&iv) == 0);
+	printf("%d\n", size(&iv));
 
 	push_back(&iv, 1);
+	printf("%d\n", size(&iv));
+	assert(size(&iv) == 1);
 	push_back(&iv, 2);
+	printf("%d\n", size(&iv));
+	assert(size(&iv) == 2);
 	push_back(&iv, 3);
+	printf("%d\n", size(&iv));
+	assert(size(&iv) == 3);
 
 	assert(!empty(&iv));
 	assert(size(&iv) == 3);
-	assert(iv[0] == 1);
 	assert(at(&iv, 0) == 1);
-	assert(iv[1] == 2);
+	assert((&iv)[0] == 1);
 	assert(at(&iv, 1) == 2);
-	assert(iv[2] == 3);
+	assert((&iv)[1] == 2);
 	assert(at(&iv, 2) == 3);
+	assert((&iv)[2] == 3);
 
 	clear(&iv);
@@ -23,4 +44,5 @@
 	assert(empty(&iv));
 	assert(size(&iv) == 0);
+	printf("%d\n", size(&iv));
 
 	return 0;
