Paul's work in test.c