Last work on gc_test_alloc.c
Fix conflicts