Adapt test.c to interface changes