trunk with test.c added