Improved test.c