Updated to the latest test.c